Autogenerated HTML docs for v1.6.0-rc0-42-g186458

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 3f9519e7467b2f4fe1e396e73001c311dbe7f39b..8cf9409add95df5caab3aa645a8c151f4183bc0d 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -971,11 +971,11 @@ people using 80-column terminals.</p></div>
         This flag changes the way a merge commit patch is displayed,\r
         in a similar way to the <em>-c</em> option. It implies the <em>-c</em>\r
         and <em>-p</em> options and further compresses the patch output\r
-        by omitting hunks that show differences from only one\r
-        parent, or show the same change from all but one parent\r
-        for an Octopus merge.  When this optimization makes all\r
-        hunks disappear, the commit itself and the commit log\r
-        message is not shown, just like in any other "empty diff" case.\r
+        by omitting uninteresting hunks whose the contents in the parents\r
+        have only two variants and the merge result picks one of them\r
+        without modification.  When all hunks are uninteresting, the commit\r
+        itself and the commit log message is not shown, just like in any other\r
+        "empty diff" case.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1855,7 +1855,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-22 09:19:07 UTC\r
+Last updated 2008-07-24 04:02:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index 0e45b58d8332cc9f48e0e18165f536adb94a5c6f..8c8f35b7a762d42d3c45ff9f4eee1cb32d3917b6 100644 (file)
--- a/git-diff-tree.txt
+++ b/git-diff-tree.txt
@@ -93,11 +93,11 @@ include::pretty-options.txt[]
        This flag changes the way a merge commit patch is displayed,
        in a similar way to the '-c' option. It implies the '-c'
        and '-p' options and further compresses the patch output
-       by omitting hunks that show differences from only one
-       parent, or show the same change from all but one parent
-       for an Octopus merge.  When this optimization makes all
-       hunks disappear, the commit itself and the commit log
-       message is not shown, just like in any other "empty diff" case.
+       by omitting uninteresting hunks whose the contents in the parents
+       have only two variants and the merge result picks one of them
+       without modification.  When all hunks are uninteresting, the commit
+       itself and the commit log message is not shown, just like in any other
+       "empty diff" case.
 
 --always::
        Show the commit itself and the commit log message even

diff --git a/git-filter-branch.html b/git-filter-branch.html
index 9e255390c14e75f68a601962496a3d2e93a6f88c..4567d3b2fc9520681d349117144abf154c6b6f23 100644 (file)
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -550,7 +550,7 @@ Thus you may instead want to use <tt>rm -f filename</tt> as the script.</p></div
 <div class="para"><p>A significantly faster version:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>git filter-branch --index-filter 'git update-index --remove filename' HEAD</tt></pre>\r
+<pre><tt>git filter-branch --index-filter 'git rm --cached filename' HEAD</tt></pre>\r
 </div></div>\r
 <div class="para"><p>Now, you will get the rewritten history saved in HEAD.</p></div>\r
 <div class="para"><p>To set a commit (which typically is at the tip of another\r
@@ -665,7 +665,7 @@ and the git list &lt;git@vger.kernel.org&gt;</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-06 05:16:46 UTC\r
+Last updated 2008-07-24 04:02:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-filter-branch.txt b/git-filter-branch.txt
index a3edc0024600e34d956b8e8d76dd8a6a8bd6c8bd..7ba9dab5e6c0b32f927d24de800e17b71a06b84b 100644 (file)
--- a/git-filter-branch.txt
+++ b/git-filter-branch.txt
@@ -191,7 +191,7 @@ Thus you may instead want to use `rm -f filename` as the script.
 A significantly faster version:
 
 --------------------------------------------------------------------------
-git filter-branch --index-filter 'git update-index --remove filename' HEAD
+git filter-branch --index-filter 'git rm --cached filename' HEAD
 --------------------------------------------------------------------------
 
 Now, you will get the rewritten history saved in HEAD.

diff --git a/git-log.html b/git-log.html
index 2e087ed36570530df5cf08757dbf305de98074b5..48e952527931c4a16c73debd03cd842b30b8af24 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -1030,9 +1030,9 @@ options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> fo
 <dd>\r
 <p>\r
         This flag implies the <em>-c</em> options and further compresses the\r
-        patch output by omitting hunks that show differences from only\r
-        one parent, or show the same change from all but one parent for\r
-        an Octopus merge.\r
+        patch output by omitting uninteresting hunks whose contents in\r
+        the parents have only two variants and the merge result picks\r
+        one of them without modification.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2030,7 +2030,7 @@ reversible operation.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-22 09:19:10 UTC\r
+Last updated 2008-07-24 04:02:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rerere.html b/git-rerere.html
index b57915996b6e4d4927cef7f110386d83edc9e190..95331b9ac7c967c7c9b02411581d520407cb7823 100644 (file)
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -354,7 +354,7 @@ its working state.</p></div>
 <dd>\r
 <p>\r
 This resets the metadata used by rerere if a merge resolution is to be\r
-is aborted.  Calling <em>git-am --skip</em> or <em>git-rebase [--skip|--abort]</em>\r
+aborted.  Calling <em>git-am [--skip|--abort]</em> or <em>git-rebase [--skip|--abort]</em>\r
 will automatically invoke this command.\r
 </p>\r
 </dd>\r
@@ -529,7 +529,7 @@ conflict.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-22 09:19:15 UTC\r
+Last updated 2008-07-24 04:02:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rerere.txt b/git-rerere.txt
index beebd5301fc14c196722199f3b952980974f53d7..89f321b414212a555f1e0fb0ff0ce6f4c180fd06 100644 (file)
--- a/git-rerere.txt
+++ b/git-rerere.txt
@@ -37,7 +37,7 @@ its working state.
 'clear'::
 
 This resets the metadata used by rerere if a merge resolution is to be
-is aborted.  Calling 'git-am --skip' or 'git-rebase [--skip|--abort]'
+aborted.  Calling 'git-am [--skip|--abort]' or 'git-rebase [--skip|--abort]'
 will automatically invoke this command.
 
 'diff'::

diff --git a/git-rev-list.html b/git-rev-list.html
index b7f5bd6e2564b8f95839bee36ffd3b1a8bbf2447..d987a1f8a5dd33c17870288d92880a4be20ad398 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -569,9 +569,9 @@ options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> fo
 <dd>\r
 <p>\r
         This flag implies the <em>-c</em> options and further compresses the\r
-        patch output by omitting hunks that show differences from only\r
-        one parent, or show the same change from all but one parent for\r
-        an Octopus merge.\r
+        patch output by omitting uninteresting hunks whose contents in\r
+        the parents have only two variants and the merge result picks\r
+        one of them without modification.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1345,7 +1345,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-16 03:23:21 UTC\r
+Last updated 2008-07-24 04:02:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/rev-list-options.txt b/rev-list-options.txt
index b6f5d87e723bec4f00a3929274c43bfd478cc083..3aa38097e6350a02c50873d5c670e108003fab22 100644 (file)
--- a/rev-list-options.txt
+++ b/rev-list-options.txt
@@ -112,9 +112,9 @@ options may be given. See linkgit:git-diff-files[1] for more options.
 --cc::
 
        This flag implies the '-c' options and further compresses the
-       patch output by omitting hunks that show differences from only
-       one parent, or show the same change from all but one parent for
-       an Octopus merge.
+       patch output by omitting uninteresting hunks whose contents in
+       the parents have only two variants and the merge result picks
+       one of them without modification.
 
 -r::
 

diff --git a/technical/api-string-list.html b/technical/api-string-list.html
index 7095ff7a239358e6ad976b3d6dabefaba5a6faa3..05ce239fe016dd5d78a4c514c428817c35a02975 100644 (file)
--- a/technical/api-string-list.html
+++ b/technical/api-string-list.html
@@ -367,7 +367,7 @@ memset(&list, 0, sizeof(struct string_list));
 string_list_append("foo", &list);\r
 string_list_append("bar", &list);\r
 for (i = 0; i < list.nr; i++)\r
-        printf("%s\n", list.items[i].path)</tt></pre>\r
+        printf("%s\n", list.items[i].string)</tt></pre>\r
 </div></div>\r
 <div class="admonitionblock">\r
 <table><tr>\r
@@ -497,7 +497,7 @@ counterpart for sorted lists, which performs a binary search.</p></div>
 </p>\r
 </li>\r
 </ul></div>\r
-<div class="para"><p>Represents an item of the list. The <tt>path</tt> member is a pointer to the\r
+<div class="para"><p>Represents an item of the list. The <tt>string</tt> member is a pointer to the\r
 string, and you may use the <tt>util</tt> member for any purpose, if you want.</p></div>\r
 <div class="ilist"><ul>\r
 <li>\r
@@ -534,7 +534,7 @@ Setting the <tt>strdup_strings</tt> member to 1 will strdup() the strings
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-22 09:19:19 UTC\r
+Last updated 2008-07-24 04:02:44 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/technical/api-string-list.txt b/technical/api-string-list.txt
index 92b3ecdae28afa06331382f937fd887dfcca6b15..293bb15d206e71f57e906b33ca27ee05e3429521 100644 (file)
--- a/technical/api-string-list.txt
+++ b/technical/api-string-list.txt
@@ -41,7 +41,7 @@ memset(&list, 0, sizeof(struct string_list));
 string_list_append("foo", &list);
 string_list_append("bar", &list);
 for (i = 0; i < list.nr; i++)
-       printf("%s\n", list.items[i].path)
+       printf("%s\n", list.items[i].string)
 ----
 
 NOTE: It is more efficient to build an unsorted list and sort it
@@ -113,7 +113,7 @@ Data structures
 
 * `struct string_list_item`
 
-Represents an item of the list. The `path` member is a pointer to the
+Represents an item of the list. The `string` member is a pointer to the
 string, and you may use the `util` member for any purpose, if you want.
 
 * `struct string_list`