Autogenerated HTML docs for v1.5.0-rc0-g6934

diff --git a/diff-options.txt b/diff-options.txt
index f12082e134871c37c92a06c68430de2ef2a0413b..da1cc60e970027bec50c484e1db5717ec90eb150 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -19,7 +19,9 @@
 --numstat::
        Similar to \--stat, but shows number of added and
        deleted lines in decimal notation and pathname without
-       abbreviation, to make it more machine friendly.
+       abbreviation, to make it more machine friendly.  For
+       binary files, outputs two `-` instead of saying
+       `0 0`.
 
 --shortstat::
        Output only the last line of the --stat format containing total

diff --git a/git-apply.html b/git-apply.html
index f71e40775c2f53ebc4388fff3a2fb937f92f9a69..39605a61f13e842ec964ec0036162c97957832c8 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -312,8 +312,9 @@ and a work tree.</p>
 <p>\r
         Similar to --stat, but shows number of added and\r
         deleted lines in decimal notation and pathname without\r
-        abbreviation, to make it more machine friendly.  Turns\r
-        off "apply".\r
+        abbreviation, to make it more machine friendly.  For\r
+        binary files, outputs two <tt>-</tt> instead of saying\r
+        <tt>0 0</tt>.  Turns off "apply".\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -582,7 +583,7 @@ apply.whitespace
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Nov-2006 22:17:47 UTC\r
+Last updated 26-Dec-2006 09:11:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.txt b/git-apply.txt
index 2cc32d1c5efa0ba9c69ce59d481ca852045096c0..33b93db508062529fe956b79e0618e67848b19de 100644 (file)
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -33,8 +33,9 @@ OPTIONS
 --numstat::
        Similar to \--stat, but shows number of added and
        deleted lines in decimal notation and pathname without
-       abbreviation, to make it more machine friendly.  Turns
-       off "apply".
+       abbreviation, to make it more machine friendly.  For
+       binary files, outputs two `-` instead of saying
+       `0 0`.  Turns off "apply".
 
 --summary::
        Instead of applying the patch, output a condensed

diff --git a/git-diff-files.html b/git-diff-files.html
index abcc5c8643c888bd6d1afd216aa5e241f8ec9d37..a755740bb4f15982c5ff6284c982b1dfee555cbe 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -334,7 +334,9 @@ same as "git-diff-index" and "git-diff-tree".</p>
 <p>\r
         Similar to --stat, but shows number of added and\r
         deleted lines in decimal notation and pathname without\r
-        abbreviation, to make it more machine friendly.\r
+        abbreviation, to make it more machine friendly.  For\r
+        binary files, outputs two <tt>-</tt> instead of saying\r
+        <tt>0 0</tt>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -984,7 +986,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Dec-2006 07:43:47 UTC\r
+Last updated 26-Dec-2006 09:11:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 8b4c6a016d0f9a9fd53a70a2c8e3ba1a1d952f37..ec23f3d789ef46335d382f65050351d0d2b664af 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -335,7 +335,9 @@ entries in the index are compared.</p>
 <p>\r
         Similar to --stat, but shows number of added and\r
         deleted lines in decimal notation and pathname without\r
-        abbreviation, to make it more machine friendly.\r
+        abbreviation, to make it more machine friendly.  For\r
+        binary files, outputs two <tt>-</tt> instead of saying\r
+        <tt>0 0</tt>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1074,7 +1076,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Dec-2006 07:43:48 UTC\r
+Last updated 26-Dec-2006 09:11:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-stages.html b/git-diff-stages.html
index 8c5fdb0f56efb9a237b280090747f2d483c12f9f..60d7cadc8a37e192eddc7749bbd9f4d0b7bff1a4 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -332,7 +332,9 @@ unmerged index file.</p>
 <p>\r
         Similar to --stat, but shows number of added and\r
         deleted lines in decimal notation and pathname without\r
-        abbreviation, to make it more machine friendly.\r
+        abbreviation, to make it more machine friendly.  For\r
+        binary files, outputs two <tt>-</tt> instead of saying\r
+        <tt>0 0</tt>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -958,7 +960,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Dec-2006 07:43:49 UTC\r
+Last updated 26-Dec-2006 09:11:33 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index bd0a9bfd2f448c5fc43e757f52c91a2d8b212633..a09faf5b8d9aff020cf5b89361531614d7ee67b6 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -337,7 +337,9 @@ git-diff-tree(1) Manual Page
 <p>\r
         Similar to --stat, but shows number of added and\r
         deleted lines in decimal notation and pathname without\r
-        abbreviation, to make it more machine friendly.\r
+        abbreviation, to make it more machine friendly.  For\r
+        binary files, outputs two <tt>-</tt> instead of saying\r
+        <tt>0 0</tt>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1266,7 +1268,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Dec-2006 07:43:50 UTC\r
+Last updated 26-Dec-2006 09:11:33 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index 5bcb2969e67cf0c1761ed78c6d8ea33f16707b7e..8fb0e467624846557ac6f35262a5de572c3b9525 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -381,7 +381,9 @@ any &lt;tree-ish&gt;.</p>
 <p>\r
         Similar to --stat, but shows number of added and\r
         deleted lines in decimal notation and pathname without\r
-        abbreviation, to make it more machine friendly.\r
+        abbreviation, to make it more machine friendly.  For\r
+        binary files, outputs two <tt>-</tt> instead of saying\r
+        <tt>0 0</tt>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -815,7 +817,7 @@ output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Dec-2006 02:25:50 UTC\r
+Last updated 26-Dec-2006 09:11:34 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reset.html b/git-reset.html
index d9a2baa3701a95ce49e169106c70fbb90b114ec3..d331aba3f0b77a09028083df637c6b98b28ca790 100644 (file)
--- a/git-reset.html
+++ b/git-reset.html
@@ -272,7 +272,9 @@ git-reset(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-reset</em> [--mixed | --soft | --hard] [&lt;commit-ish&gt;]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-reset</em> [--mixed | --soft | --hard] [&lt;commit&gt;]\r
+<em>git-reset</em> [--mixed] &lt;commit&gt; [--] &lt;paths&gt;&#8230;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -283,6 +285,8 @@ commit (or set of commits) and want to redo that part without showing
 the undo in the history.</p>\r
 <p>If you want to undo a commit other than the latest on a branch,\r
 <a href="git-revert.html">git-revert(1)</a> is your friend.</p>\r
+<p>The second form with <em>paths</em> is used to revert selected paths in\r
+the index from a given commit, without moving HEAD.</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -315,11 +319,11 @@ the undo in the history.</p>
 <p>\r
         Matches the working tree and index to that of the tree being\r
         switched to. Any changes to tracked files in the working tree\r
-        since &lt;commit-ish&gt; are lost.\r
+        since &lt;commit&gt; are lost.\r
 </p>\r
 </dd>\r
 <dt>\r
-&lt;commit-ish&gt;\r
+&lt;commit&gt;\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -566,7 +570,7 @@ At this point the index file still has all the WIP changes you
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Dec-2006 07:43:52 UTC\r
+Last updated 26-Dec-2006 09:11:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reset.txt b/git-reset.txt
index 4a4ceb62012d7dbd56085a87d62aa4dec928d800..4f424782ebbd90572793a86bce862f3b856f56e0 100644 (file)
--- a/git-reset.txt
+++ b/git-reset.txt
@@ -7,7 +7,9 @@ git-reset - Reset current HEAD to the specified state
 
 SYNOPSIS
 --------
-'git-reset' [--mixed | --soft | --hard] [<commit-ish>]
+[verse]
+'git-reset' [--mixed | --soft | --hard] [<commit>]
+'git-reset' [--mixed] <commit> [--] <paths>...
 
 DESCRIPTION
 -----------
@@ -21,6 +23,10 @@ the undo in the history.
 If you want to undo a commit other than the latest on a branch,
 gitlink:git-revert[1] is your friend.
 
+The second form with 'paths' is used to revert selected paths in
+the index from a given commit, without moving HEAD.
+
+
 OPTIONS
 -------
 --mixed::
@@ -37,9 +43,9 @@ OPTIONS
 --hard::
        Matches the working tree and index to that of the tree being
        switched to. Any changes to tracked files in the working tree
-       since <commit-ish> are lost.
+       since <commit> are lost.
 
-<commit-ish>::
+<commit>::
        Commit to make the current HEAD.
 
 Examples

diff --git a/git-show-branch.html b/git-show-branch.html
index 13e5eb309644bbec59eebfb94cf51cc51403a35d..936e44c9dca93936f5e4c09e919a1a9dcd6ecefb 100644 (file)
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -275,7 +275,8 @@ git-show-branch(1) Manual Page
 <div class="verseblock">\r
 <div class="content"><em>git-show-branch</em> [--all] [--remotes] [--topo-order] [--current]\r
                 [--more=&lt;n&gt; | --list | --independent | --merge-base]\r
-                [--no-name | --sha1-name] [--topics] [&lt;rev&gt; | &lt;glob&gt;]&#8230;</div></div>\r
+                [--no-name | --sha1-name] [--topics] [&lt;rev&gt; | &lt;glob&gt;]&#8230;\r
+<em>git-show-branch</em> --reflog[=&lt;n&gt;] &lt;ref&gt;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -428,6 +429,14 @@ no &lt;rev&gt; nor &lt;glob&gt; is given on the command line.</p>
         topic1 topic2"\r
 </p>\r
 </dd>\r
+<dt>\r
+--reflog[=&lt;n&gt;] &lt;ref&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shows &lt;n&gt; most recent ref-log entries for the given ref.\r
+</p>\r
+</dd>\r
 </dl>\r
 <p>Note that --more, --list, --independent and --merge-base options\r
 are mutually exclusive.</p>\r
@@ -500,7 +509,7 @@ your topic branch, it is shown as well.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Dec-2006 10:29:46 UTC\r
+Last updated 26-Dec-2006 09:11:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show-branch.txt b/git-show-branch.txt
index dafacd43080b6ab00205fab2a84617834ad5851f..912e15bcba54d28d7e4f71ffd3f9da923f2a6385 100644 (file)
--- a/git-show-branch.txt
+++ b/git-show-branch.txt
@@ -11,6 +11,7 @@ SYNOPSIS
 'git-show-branch' [--all] [--remotes] [--topo-order] [--current]
                [--more=<n> | --list | --independent | --merge-base]
                [--no-name | --sha1-name] [--topics] [<rev> | <glob>]...
+'git-show-branch' --reflog[=<n>] <ref>
 
 DESCRIPTION
 -----------
@@ -96,6 +97,10 @@ OPTIONS
        will show the revisions given by "git rev-list {caret}master
        topic1 topic2"
 
+--reflog[=<n>] <ref>::
+       Shows <n> most recent ref-log entries for the given ref.
+
+
 Note that --more, --list, --independent and --merge-base options
 are mutually exclusive.