Autogenerated HTML docs for v1.4.3-g72bb

diff --git a/diff-options.txt b/diff-options.txt
index 7b7b9e8ce92db7fbb2072b75a613b073b0c5a4e6..e112172ca57da75ce6c2dd447cc97c6aa2b6499e 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -16,6 +16,11 @@
        The width of the filename part can be controlled by
        giving another width to it separated by a comma.
 
+--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.
+
 --summary::
        Output a condensed summary of extended header information
        such as creations, renames and mode changes.

diff --git a/git-diff-files.html b/git-diff-files.html
index 1edeb7ad0bf2cc5b7a2fd1f8de4fb9284c7d8a37..67bf251861c33b83fd2fbd4d8abb66c200edc3df 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -328,6 +328,16 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </p>\r
 </dd>\r
 <dt>\r
+--numstat\r
+</dt>\r
+<dd>\r
+<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
+</p>\r
+</dd>\r
+<dt>\r
 --summary\r
 </dt>\r
 <dd>\r
@@ -917,7 +927,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:00 UTC\r
+Last updated 19-Oct-2006 05:58:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 386993878897ec757830bd0767eae256f879113f..4118f5cc5595f67448cf391b1acf7ecc31da052d 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -329,6 +329,16 @@ entries in the index are compared.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--numstat\r
+</dt>\r
+<dd>\r
+<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
+</p>\r
+</dd>\r
+<dt>\r
 --summary\r
 </dt>\r
 <dd>\r
@@ -1007,7 +1017,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:01 UTC\r
+Last updated 19-Oct-2006 05:58:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-stages.html b/git-diff-stages.html
index 9030aabc0dacd2b6e21adaf90c80121c6d880cd7..0f2faa3e95a1918593e3c4c550539e63e0f74584 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -326,6 +326,16 @@ unmerged index file.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--numstat\r
+</dt>\r
+<dd>\r
+<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
+</p>\r
+</dd>\r
+<dt>\r
 --summary\r
 </dt>\r
 <dd>\r
@@ -891,7 +901,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:02 UTC\r
+Last updated 19-Oct-2006 05:58:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 6dc78cd06d098924a6775c685d97d0253f6260b2..e105e89acbf8743e0f88aa12cf63d6442962d900 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -331,6 +331,16 @@ git-diff-tree(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
+--numstat\r
+</dt>\r
+<dd>\r
+<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
+</p>\r
+</dd>\r
+<dt>\r
 --summary\r
 </dt>\r
 <dd>\r
@@ -1079,7 +1089,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:03 UTC\r
+Last updated 19-Oct-2006 05:58:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.html b/git-grep.html
index 7157465a14b12c2920694e6f7ac45647c08ed037..1074a2f8b3d1fffa0efb4e24805bb90b118a7b13 100644 (file)
--- a/git-grep.html
+++ b/git-grep.html
@@ -278,7 +278,7 @@ git-grep(1) Manual Page
            [-v | --invert-match] [-h|-H] [--full-name]\r
            [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings]\r
            [-n] [-l | --files-with-matches] [-L | --files-without-match]\r
-           [-c | --count]\r
+           [-c | --count] [--all-match]\r
            [-A <post-context>] [-B <pre-context>] [-C <context>]\r
            [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>…]\r
            [<tree>…]\r
@@ -436,6 +436,16 @@ registered in the index file, or given tree objects.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--all-match\r
+</dt>\r
+<dd>\r
+<p>\r
+        When giving multiple pattern expressions combined with <tt>--or</tt>,\r
+        this flag is specified to limit the match to files that\r
+        have lines to match all of them.\r
+</p>\r
+</dd>\r
+<dt>\r
 <tt>&lt;tree&gt;&#8230;</tt>\r
 </dt>\r
 <dd>\r
@@ -466,6 +476,15 @@ git grep -e '#define' --and \( -e MAX_PATH -e PATH_MAX \)
         <tt>PATH_MAX</tt>.\r
 </p>\r
 </dd>\r
+<dt>\r
+git grep --all-match -e NODE -e Unexpected\r
+</dt>\r
+<dd>\r
+<p>\r
+        Looks for a line that has <tt>NODE</tt> or <tt>Unexpected</tt> in\r
+        files that have lines that match both.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Author</h2>\r
@@ -483,7 +502,7 @@ revamped by Junio C Hamano.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:06 UTC\r
+Last updated 19-Oct-2006 05:58:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.txt b/git-grep.txt
index d8af4d961b83e362b83f25b21d40f9d54ed4bc11..bfbece9864a3c6d8b38dd526e2483fea0fb0b58f 100644 (file)
--- a/git-grep.txt
+++ b/git-grep.txt
@@ -14,7 +14,7 @@ SYNOPSIS
           [-v | --invert-match] [-h|-H] [--full-name]
           [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings]
           [-n] [-l | --files-with-matches] [-L | --files-without-match]
-          [-c | --count]
+          [-c | --count] [--all-match]
           [-A <post-context>] [-B <pre-context>] [-C <context>]
           [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...]
           [<tree>...]
@@ -96,6 +96,11 @@ OPTIONS
        higher precedence than `--or`.  `-e` has to be used for all
        patterns.
 
+--all-match::
+       When giving multiple pattern expressions combined with `--or`,
+       this flag is specified to limit the match to files that
+       have lines to match all of them.
+
 `<tree>...`::
        Search blobs in the trees for specified patterns.
 
@@ -111,6 +116,10 @@ git grep -e \'#define\' --and \( -e MAX_PATH -e PATH_MAX \)::
        Looks for a line that has `#define` and either `MAX_PATH` or
        `PATH_MAX`.
 
+git grep --all-match -e NODE -e Unexpected::
+       Looks for a line that has `NODE` or `Unexpected` in
+       files that have lines that match both.
+
 Author
 ------
 Originally written by Linus Torvalds <torvalds@osdl.org>, later

diff --git a/git-rebase.html b/git-rebase.html
index 94d7caf9afddd87b740980f457f6cbb6ae7577bf..6403e43b29db64a51215b9b7382bf68bb97558e5 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -272,7 +272,7 @@ git-rebase(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-rebase</em> [--merge] [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]</p>\r
+<p><em>git-rebase</em> [-v] [--merge] [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]</p>\r
 <p><em>git-rebase</em> --continue | --skip | --abort</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -420,6 +420,14 @@ desired resolution, you can continue the rebasing process with</p>
         head, <tt>git-merge-octopus</tt> otherwise).  This implies --merge.\r
 </p>\r
 </dd>\r
+<dt>\r
+-v, --verbose\r
+</dt>\r
+<dd>\r
+<p>\r
+        Display a diffstat of what changed upstream since the last rebase.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>MERGE STRATEGIES</h2>\r
@@ -508,7 +516,7 @@ a rebase.  Upon completion, &lt;branch&gt; will be the current branch.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:20 UTC\r
+Last updated 19-Oct-2006 05:58:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.txt b/git-rebase.txt
index 9d7bcaa38cc5c13e29c00ddd18c64202e98cb5f8..10f2924f4df1eb29c1baf4484d2837377b6cfcb3 100644 (file)
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -7,7 +7,7 @@ git-rebase - Rebase local commits to a new head
 
 SYNOPSIS
 --------
-'git-rebase' [--merge] [--onto <newbase>] <upstream> [<branch>]
+'git-rebase' [-v] [--merge] [--onto <newbase>] <upstream> [<branch>]
 
 'git-rebase' --continue | --skip | --abort
 
@@ -121,6 +121,9 @@ OPTIONS
        is used instead (`git-merge-recursive` when merging a single
        head, `git-merge-octopus` otherwise).  This implies --merge.
 
+-v, \--verbose::
+       Display a diffstat of what changed upstream since the last rebase.
+
 include::merge-strategies.txt[]
 
 NOTES

diff --git a/git-rev-parse.html b/git-rev-parse.html
index c9005d7727a09c91156f04e1f54bba0eb317d4ed..228603a993dd6b7bb18be1eda5d06df0972da545 100644 (file)
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -473,7 +473,9 @@ distinguish between them.</p>
 <div class="sectionbody">\r
 <p>A revision parameter typically, but not necessarily, names a\r
 commit object.  They use what is called an <em>extended SHA1</em>\r
-syntax.</p>\r
+syntax.  Here are various ways to spell object names.  The\r
+ones listed near the end of this list are to name trees and\r
+blobs contained in a commit.</p>\r
 <ul>\r
 <li>\r
 <p>\r
@@ -486,6 +488,12 @@ The full SHA1 object name (40-byte hexadecimal string), or
 </li>\r
 <li>\r
 <p>\r
+An output from <tt>git-describe</tt>; i.e. a closest tag, followed by a\r
+  dash, a <em>g</em>, and an abbreviated object name.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 A symbolic ref name.  E.g. <em>master</em> typically means the commit\r
   object referenced by $GIT_DIR/refs/heads/master.  If you\r
   happen to have both heads/master and tags/master, you can\r
@@ -538,6 +546,21 @@ A suffix <em>^</em> followed by an empty brace pair
   found.\r
 </p>\r
 </li>\r
+<li>\r
+<p>\r
+A suffix <em>:</em> followed by a path; this names the blob or tree\r
+  at the given path in the tree-ish object named by the part\r
+  before the colon.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+A colon, optionally followed by a stage number (0 to 3) and a\r
+  colon, followed by a path; this names a blob object in the\r
+  index at the given path.  Missing stage number (and the colon\r
+  that follows it) names an stage 0 entry.\r
+</p>\r
+</li>\r
 </ul>\r
 <p>Here is an illustration, by Jon Loeliger.  Both node B and C are\r
 a commit parents of commit node A.  Parent commits are ordered\r
@@ -614,7 +637,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:26 UTC\r
+Last updated 19-Oct-2006 05:58:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index 2f1306c1d95654802cbe417a19de6047777b91bb..5d4257062d1776ee18900b84e805197a9028e2f0 100644 (file)
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -111,7 +111,9 @@ SPECIFYING REVISIONS
 
 A revision parameter typically, but not necessarily, names a
 commit object.  They use what is called an 'extended SHA1'
-syntax.
+syntax.  Here are various ways to spell object names.  The
+ones listed near the end of this list are to name trees and
+blobs contained in a commit.
 
 * The full SHA1 object name (40-byte hexadecimal string), or
   a substring of such that is unique within the repository.
@@ -119,6 +121,9 @@ syntax.
   name the same commit object if there are no other object in
   your repository whose object name starts with dae86e.
 
+* An output from `git-describe`; i.e. a closest tag, followed by a
+  dash, a 'g', and an abbreviated object name.
+
 * A symbolic ref name.  E.g. 'master' typically means the commit
   object referenced by $GIT_DIR/refs/heads/master.  If you
   happen to have both heads/master and tags/master, you can
@@ -156,6 +161,15 @@ syntax.
   and dereference the tag recursively until a non-tag object is
   found.
 
+* A suffix ':' followed by a path; this names the blob or tree
+  at the given path in the tree-ish object named by the part
+  before the colon.
+
+* A colon, optionally followed by a stage number (0 to 3) and a
+  colon, followed by a path; this names a blob object in the
+  index at the given path.  Missing stage number (and the colon
+  that follows it) names an stage 0 entry.
+
 Here is an illustration, by Jon Loeliger.  Both node B and C are
 a commit parents of commit node A.  Parent commits are ordered
 left-to-right.