with GIT_WORK_TREE environment settings.
-
* "git apply --unidiff-zero" incorrectly applied a -U0 patch that inserts
a new line before the second line.
+* "git blame -c" did not exactly work like "git annotate" when range
+ boundaries are involved.
+
* "git clone $there $here/" with extra trailing slashes after explicit
local directory name $here did not work as expected.
* "git diff --dirstat -M" did not add changes in subdirectories up
correctly for renamed paths.
+* "git diff --cumulative" did not imply "--dirstat".
+
* "git for-each-ref refs/heads/" did not work as expected.
-* "git log --grep=pattern -i" did not ignore case.
+* "git gui" allowed users to feed patch without any context to be applied.
+
+* "git gui" botched parsing "diff" output when a line that begins with two
+ dashes and a space gets removed or a line that begins with two pluses
+ and a space gets added.
+
+* "git gui" translation updates and i18n fixes.
+
+* "git log -i --grep=pattern" did not ignore case; neither "git log -E
+ --grep=pattern" triggered extended regexp.
* "git log --pretty="%ad" --date=short" did not use short format when
showing the timestamp.
* Build procedure for "git shell" that used stub versions of some
functions and globals was not understood by linkers on some platforms.
+* "git stash" was fooled by a stat-dirty but otherwise unmodified paths
+ and refused to work until the user refreshed the index.
+
* "git verify-pack -v" did not work correctly when given more than one
packfile.
--
exec >/var/tmp/1
-O=v1.6.0.1-49-g6a42cfe
+O=v1.6.0.1-61-g1eff26c
echo O=$(git describe maint)
git shortlog --no-merges $O..maint
+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-annotate(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git annotate</em> [options] file [revision]</p>\r
+<div class="para"><p><em>git annotate</em> [options] file [revision]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Annotates each line in the given file with information from the commit\r
-which introduced the line. Optionally annotate from a given revision.</p>\r
+<div class="para"><p>Annotates each line in the given file with information from the commit\r
+which introduced the line. Optionally annotate from a given revision.</p></div>\r
+<div class="para"><p>The only difference between this command and <a href="git-blame.html">git-blame(1)</a> is that\r
+they use slightly different output formats, and this command exists only\r
+for backward compatibility to support existing scripts, and provide more\r
+familiar command name for people coming from other SCM systems.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-b\r
</dt>\r
Annotate only the given line range. <start> and <end> can take\r
one of these forms:\r
</p>\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
number\r
</p>\r
-<p>If <start> or <end> is a number, it specifies an\r
-absolute line number (lines count from 1).</p>\r
+<div class="para"><p>If <start> or <end> is a number, it specifies an\r
+absolute line number (lines count from 1).</p></div>\r
</li>\r
<li>\r
<p>\r
/regex/\r
</p>\r
-<p>This form will use the first line matching the given\r
+<div class="para"><p>This form will use the first line matching the given\r
POSIX regex. If <end> is a regex, it will search\r
-starting at the line given by <start>.</p>\r
+starting at the line given by <start>.</p></div>\r
</li>\r
<li>\r
<p>\r
+offset or -offset\r
</p>\r
-<p>This is only valid for <end> and will specify a number\r
-of lines before or after the line given by <start>.</p>\r
+<div class="para"><p>This is only valid for <end> and will specify a number\r
+of lines before or after the line given by <start>.</p></div>\r
</li>\r
-</ul>\r
+</ul></div>\r
</dd>\r
<dt>\r
-l\r
to the child commit. With this option, both groups of lines\r
are blamed on the parent.\r
</p>\r
-<p><num> is optional but it is the lower bound on the number of\r
+<div class="para"><p><num> is optional but it is the lower bound on the number of\r
alphanumeric characters that git must detect as moving\r
within a file for it to associate those lines with the parent\r
-commit.</p>\r
+commit.</p></div>\r
</dd>\r
<dt>\r
-C|<num>|\r
the command looks for copies from all other files in the\r
parent for the commit that creates the file in addition.\r
</p>\r
-<p><num> is optional but it is the lower bound on the number of\r
+<div class="para"><p><num> is optional but it is the lower bound on the number of\r
alphanumeric characters that git must detect as moving\r
between files for it to associate those lines with the parent\r
-commit.</p>\r
+commit.</p></div>\r
</dd>\r
<dt>\r
-h\r
Show help message.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>SEE ALSO</h2>\r
+<h2 id="_see_also">SEE ALSO</h2>\r
<div class="sectionbody">\r
-<p><a href="git-blame.html">git-blame(1)</a></p>\r
+<div class="para"><p><a href="git-blame.html">git-blame(1)</a></p></div>\r
</div>\r
-<h2>AUTHOR</h2>\r
+<h2 id="_author">AUTHOR</h2>\r
<div class="sectionbody">\r
-<p>Written by Ryan Anderson <ryan@michonline.com>.</p>\r
+<div class="para"><p>Written by Ryan Anderson <ryan@michonline.com>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:32 UTC\r
+Last updated 2008-09-07 06:05:36 UTC\r
</div>\r
</div>\r
</body>\r
projects / git.git / commitdiff