Autogenerated HTML docs for v1.5.2.2-249-g45fd

diff --git a/git-diff-tree.html b/git-diff-tree.html
index daf06da1c6f65af7bfb369ea520e6f2ff9545091..5de4a7d124887a35ff8bd11d1f5aae04f7f1b8e4 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -764,6 +764,19 @@ separated with a single space are given.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--abbrev-commit\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of showing the full 40-byte hexadecimal commit object\r
+        name, show only handful hexdigits prefix.  Non default number of\r
+        digits can be specified with "--abbrev=&lt;n&gt;" (which also modifies\r
+        diff output, if it is displayed).\r
+</p>\r
+<p>This should make "--pretty=oneline" a whole lot more readable for\r
+people using 80-column terminals.</p>\r
+</dd>\r
+<dt>\r
 --encoding[=&lt;encoding&gt;]\r
 </dt>\r
 <dd>\r
@@ -1517,7 +1530,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:49:01 UTC\r
+Last updated 21-Jun-2007 00:34:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index db601f0f5e6b7f60f9356d8ebd26bb714fc60849..63b22ef922921f75c454d070f1fd63f8a3abb532 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -298,6 +298,19 @@ each commit introduces are shown.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--abbrev-commit\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of showing the full 40-byte hexadecimal commit object\r
+        name, show only handful hexdigits prefix.  Non default number of\r
+        digits can be specified with "--abbrev=&lt;n&gt;" (which also modifies\r
+        diff output, if it is displayed).\r
+</p>\r
+<p>This should make "--pretty=oneline" a whole lot more readable for\r
+people using 80-column terminals.</p>\r
+</dd>\r
+<dt>\r
 --encoding[=&lt;encoding&gt;]\r
 </dt>\r
 <dd>\r
@@ -363,7 +376,19 @@ each commit introduces are shown.</p>
 </dt>\r
 <dd>\r
 <p>\r
-    Print out the ref names of any commits that are shown.\r
+        Print out the ref names of any commits that are shown.\r
+</p>\r
+</dd>\r
+<dt>\r
+--full-diff\r
+</dt>\r
+<dd>\r
+<p>\r
+        Without this flag, "git log -p &lt;paths&gt;&#8230;" shows commits that\r
+        touch the specified paths, and diffs about the same specified\r
+        paths.  With this, the full diff is shown for commits that touch\r
+        the specified paths; this means that "&lt;paths&gt;&#8230;" limits only\r
+        commits, and doesn't limit diff for those commits.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -787,7 +812,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:49:10 UTC\r
+Last updated 21-Jun-2007 00:34:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.txt b/git-log.txt
index 6157edb404db3ff0db0bb21e826e140037acb6af..7adcdefacfd681729317c59ebacfd4a27db1effd 100644 (file)
--- a/git-log.txt
+++ b/git-log.txt
@@ -52,7 +52,14 @@ include::pretty-options.txt[]
        See also gitlink:git-reflog[1].
 
 --decorate::
-    Print out the ref names of any commits that are shown.
+       Print out the ref names of any commits that are shown.
+
+--full-diff::
+       Without this flag, "git log -p <paths>..." shows commits that
+       touch the specified paths, and diffs about the same specified
+       paths.  With this, the full diff is shown for commits that touch
+       the specified paths; this means that "<paths>..." limits only
+       commits, and doesn't limit diff for those commits.
 
 <paths>...::
        Show only commits that affect the specified paths.

diff --git a/git-read-tree.html b/git-read-tree.html
index d1d94ba6cecbc77304a3035cc1ecc39fb2054e12..ec7470ca13444398156efa85d6bd48c1ac9563cb 100644 (file)
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -272,7 +272,7 @@ git-read-tree(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-read-tree</em> (&lt;tree-ish&gt; | [[-m [--aggressive] | --reset | --prefix=&lt;prefix&gt;] [-u | -i]] [--exclude-per-directory=&lt;gitignore&gt;] [--index-output=&lt;file&gt;] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>\r
+<p><em>git-read-tree</em> (&lt;tree-ish&gt; | [[-m [--trivial] [--aggressive] | --reset | --prefix=&lt;prefix&gt;] [-u | -i]] [--exclude-per-directory=&lt;gitignore&gt;] [--index-output=&lt;file&gt;] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -333,6 +333,17 @@ will be in unmerged state when <tt>git-read-tree</tt> returns.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--trivial\r
+</dt>\r
+<dd>\r
+<p>\r
+        Restrict three-way merge by <tt>git-read-tree</tt> to happen\r
+        only if there is no file-level merging required, instead\r
+        of resolving merge for trivial cases and leaving\r
+        conflicting files unresolved in the index.\r
+</p>\r
+</dd>\r
+<dt>\r
 --aggressive\r
 </dt>\r
 <dd>\r
@@ -700,7 +711,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:49:16 UTC\r
+Last updated 21-Jun-2007 00:34:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-read-tree.txt b/git-read-tree.txt
index 84184d6294df83c3229a8035d934b23c598578d1..74c5478ba18763de1703f0c8c08c20f1aac02ac0 100644 (file)
--- a/git-read-tree.txt
+++ b/git-read-tree.txt
@@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index
 
 SYNOPSIS
 --------
-'git-read-tree' (<tree-ish> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
+'git-read-tree' (<tree-ish> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
 
 
 DESCRIPTION
@@ -50,6 +50,12 @@ OPTIONS
        trees that are not directly related to the current
        working tree status into a temporary index file.
 
+--trivial::
+       Restrict three-way merge by `git-read-tree` to happen
+       only if there is no file-level merging required, instead
+       of resolving merge for trivial cases and leaving
+       conflicting files unresolved in the index.
+
 --aggressive::
        Usually a three-way merge by `git-read-tree` resolves
        the merge for really trivial cases and leaves other

diff --git a/git-reflog.html b/git-reflog.html
index 8a0f25ce57418e0d60bdafe9061403084eb96609..1fe9a32d91a5706527c75c9bb7ce44f53f101979 100644 (file)
--- a/git-reflog.html
+++ b/git-reflog.html
@@ -298,6 +298,23 @@ the current branch. It is basically an alias for <em>git log -g --abbrev-commit
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
+--stale-fix\r
+</dt>\r
+<dd>\r
+<p>\r
+        This revamps the logic &#8212; the definition of "broken commit"\r
+        becomes: a commit that is not reachable from any of the refs and\r
+        there is a missing object among the commit, tree, or blob\r
+        objects reachable from it that is not reachable from any of the\r
+        refs.\r
+</p>\r
+<p>This computation involves traversing all the reachable objects, i.e. it\r
+has the same cost as <em>git prune</em>.  Fortunately, once this is run, we\r
+should not have to ever worry about missing objects, because the current\r
+prune and pack-objects know about reflogs and protect objects referred by\r
+them.</p>\r
+</dd>\r
+<dt>\r
 --expire=&lt;time&gt;\r
 </dt>\r
 <dd>\r
@@ -343,7 +360,7 @@ the current branch. It is basically an alias for <em>git log -g --abbrev-commit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:49:17 UTC\r
+Last updated 21-Jun-2007 00:35:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reflog.txt b/git-reflog.txt
index f717e1e30c1b2a99d1d32b86d7d3eedfe6d88d40..89bc9c51ea13630f6556b12637ce8b1cc483d2fd 100644 (file)
--- a/git-reflog.txt
+++ b/git-reflog.txt
@@ -39,6 +39,19 @@ the current branch. It is basically an alias for 'git log -g --abbrev-commit
 OPTIONS
 -------
 
+--stale-fix::
+       This revamps the logic -- the definition of "broken commit"
+       becomes: a commit that is not reachable from any of the refs and
+       there is a missing object among the commit, tree, or blob
+       objects reachable from it that is not reachable from any of the
+       refs.
++
+This computation involves traversing all the reachable objects, i.e. it
+has the same cost as 'git prune'.  Fortunately, once this is run, we
+should not have to ever worry about missing objects, because the current
+prune and pack-objects know about reflogs and protect objects referred by
+them.
+
 --expire=<time>::
        Entries older than this time are pruned.  Without the
        option it is taken from configuration `gc.reflogExpire`,

diff --git a/git-rev-list.html b/git-rev-list.html
index 8324a5e36e3229d27718d757859b30fd6a988671..99d70746ca4f555370f38e2d95a646be73746d55 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -280,11 +280,13 @@ git-rev-list(1) Manual Page
              [ --sparse ]\r
              [ --no-merges ]\r
              [ --remove-empty ]\r
+             [ --full-history ]\r
              [ --not ]\r
              [ --all ]\r
              [ --stdin ]\r
              [ --topo-order ]\r
              [ --parents ]\r
+             [ --timestamp ]\r
              [ --left-right ]\r
              [ --cherry-pick ]\r
              [ --encoding[=<encoding>] ]\r
@@ -355,6 +357,19 @@ more specialized family of commit log tools: <a href="git-log.html">git-log(1)</
 </p>\r
 </dd>\r
 <dt>\r
+--abbrev-commit\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of showing the full 40-byte hexadecimal commit object\r
+        name, show only handful hexdigits prefix.  Non default number of\r
+        digits can be specified with "--abbrev=&lt;n&gt;" (which also modifies\r
+        diff output, if it is displayed).\r
+</p>\r
+<p>This should make "--pretty=oneline" a whole lot more readable for\r
+people using 80-column terminals.</p>\r
+</dd>\r
+<dt>\r
 --encoding[=&lt;encoding&gt;]\r
 </dt>\r
 <dd>\r
@@ -406,6 +421,14 @@ e.g. "2 hours ago".</p>
 </p>\r
 </dd>\r
 <dt>\r
+--timestamp\r
+</dt>\r
+<dd>\r
+<p>\r
+        Print the raw commit timestamp.\r
+</p>\r
+</dd>\r
+<dt>\r
 --left-right\r
 </dt>\r
 <dd>\r
@@ -572,6 +595,18 @@ limiting may be applied.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--full-history\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show also parts of history irrelevant to current state of a given\r
+        path. This turns off history simplification, which removed merges\r
+        which didn't change anything at all at some child. It will still actually\r
+        simplify away merges that didn't change anything at all into either\r
+        child.\r
+</p>\r
+</dd>\r
+<dt>\r
 --no-merges\r
 </dt>\r
 <dd>\r
@@ -1074,7 +1109,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:49:19 UTC\r
+Last updated 21-Jun-2007 00:35:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index 0dba73f27607560d3e868306af78bad83dc3bfff..32cb13faec8abc08d72912dbaf6bfc668ac4abd9 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -16,11 +16,13 @@ SYNOPSIS
             [ \--sparse ]
             [ \--no-merges ]
             [ \--remove-empty ]
+            [ \--full-history ]
             [ \--not ]
             [ \--all ]
             [ \--stdin ]
             [ \--topo-order ]
             [ \--parents ]
+            [ \--timestamp ]
             [ \--left-right ]
             [ \--cherry-pick ]
             [ \--encoding[=<encoding>] ]
@@ -116,6 +118,9 @@ e.g. "2 hours ago".
 
        Print the parents of the commit.
 
+--timestamp::
+       Print the raw commit timestamp.
+
 --left-right::
 
        Mark which side of a symmetric diff a commit is reachable from.
@@ -228,6 +233,14 @@ limiting may be applied.
 
        Stop when a given path disappears from the tree.
 
+--full-history::
+
+       Show also parts of history irrelevant to current state of a given
+       path. This turns off history simplification, which removed merges
+       which didn't change anything at all at some child. It will still actually
+       simplify away merges that didn't change anything at all into either
+       child.
+
 --no-merges::
 
        Do not print commits with more than one parent.

diff --git a/git-rev-parse.html b/git-rev-parse.html
index 0ebcd0997c59e05ddc08520972ef950c4b51c1bd..d99dd799a8ee91ac18001f730c258ada54db9bf3 100644 (file)
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -432,6 +432,15 @@ distinguish between them.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--is-inside-git-dir\r
+</dt>\r
+<dd>\r
+<p>\r
+        Return "true" if we are in the git directory, otherwise "false".\r
+        Some commands require to be run in a working directory.\r
+</p>\r
+</dd>\r
+<dt>\r
 --short, --short=number\r
 </dt>\r
 <dd>\r
@@ -709,7 +718,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:49:20 UTC\r
+Last updated 21-Jun-2007 00:35:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index e1cb4ef8568d05ad7bacfb391227bb88560fd448..87771b832bdc71a9b18535f0ab21e68478891e46 100644 (file)
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -89,6 +89,10 @@ OPTIONS
 --git-dir::
        Show `$GIT_DIR` if defined else show the path to the .git directory.
 
+--is-inside-git-dir::
+       Return "true" if we are in the git directory, otherwise "false".
+       Some commands require to be run in a working directory.
+
 --short, --short=number::
        Instead of outputting the full SHA1 values of object names try to
        abbreviate them to a shorter unique name. When no length is specified

diff --git a/git-show.html b/git-show.html
index 97a1de651ed33fc42e1bcd38796e9d5e7385a900..4faf1b49764e0a88f1e7efb69f42d72ad4eca155 100644 (file)
--- a/git-show.html
+++ b/git-show.html
@@ -313,6 +313,19 @@ control how the changes the commit introduces are shown.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--abbrev-commit\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of showing the full 40-byte hexadecimal commit object\r
+        name, show only handful hexdigits prefix.  Non default number of\r
+        digits can be specified with "--abbrev=&lt;n&gt;" (which also modifies\r
+        diff output, if it is displayed).\r
+</p>\r
+<p>This should make "--pretty=oneline" a whole lot more readable for\r
+people using 80-column terminals.</p>\r
+</dd>\r
+<dt>\r
 --encoding[=&lt;encoding&gt;]\r
 </dt>\r
 <dd>\r
@@ -739,7 +752,7 @@ Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:49:22 UTC\r
+Last updated 21-Jun-2007 00:35:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/pretty-options.txt b/pretty-options.txt
index 6338def5a795a8171286626752a96f8ac88842c8..746bc5b7f9a3f96ea321586e095a4fc8ccb6e73f 100644 (file)
--- a/pretty-options.txt
+++ b/pretty-options.txt
@@ -5,6 +5,15 @@
        'full', 'fuller', 'email', 'raw' and 'format:<string>'.
        When left out the format default to 'medium'.
 
+--abbrev-commit::
+       Instead of showing the full 40-byte hexadecimal commit object
+       name, show only handful hexdigits prefix.  Non default number of
+       digits can be specified with "--abbrev=<n>" (which also modifies
+       diff output, if it is displayed).
++
+This should make "--pretty=oneline" a whole lot more readable for
+people using 80-column terminals.
+
 --encoding[=<encoding>]::
        The commit objects record the encoding used for the log message
        in their encoding header; this option can be used to tell the