Autogenerated HTML docs for v1.6.4

Junio C Hamano · Junio C Hamano · commit 543f8d61eb23 · 2009-07-29T08:35:21.000Z
diff --git a/RelNotes-1.6.3.4.txt b/RelNotes-1.6.3.4.txt
@@ -0,0 +1,36 @@
+GIT v1.6.3.4 Release Notes
+==========================
+
+Fixes since v1.6.3.3
+--------------------
+
+ * "git add --no-ignore-errors" did not override configured
+   add.ignore-errors configuration.
+
+ * "git apply --whitespace=fix" did not fix trailing whitespace on an
+   incomplete line.
+
+ * "git branch" opened too many commit objects unnecessarily.
+
+ * "git checkout -f $commit" with a path that is a file (or a symlink) in
+   the work tree to a commit that has a directory at the path issued an
+   unnecessary error message.
+
+ * "git diff -c/--cc" was very inefficient in coalescing the removed lines
+   shared between parents.
+
+ * "git diff -c/--cc" showed removed lines at the beginning of a file
+   incorrectly.
+
+ * "git remote show nickname" did not honor configured
+   remote.nickname.uploadpack when inspecting the branches at the remote.
+
+ * "git request-pull" when talking to the terminal for a preview
+   showed some of the output in the pager.
+
+ * "git request-pull start nickname [end]" did not honor configured
+   remote.nickname.uploadpack when it ran git-ls-remote against the remote
+   repository to learn the current tip of branches.
+
+Includes other documentation updates and minor fixes.
+
diff --git a/RelNotes-1.6.4.txt b/RelNotes-1.6.4.txt
@@ -67,6 +67,12 @@ Updates since v1.6.3
 
  * "git cvsexportcommit" learned -k option to stop CVS keywords expansion
 
+ * "git fast-export" learned to handle history simplification more
+   gracefully.
+
+ * "git fast-export" learned an option --tag-of-filtered-object to handle
+   dangling tags resulting from history simplification more usefully.
+
  * "git grep" learned -p option to show the location of the match using the
    same context hunk marker "git diff" uses.
 
@@ -130,15 +136,12 @@ v1.6.3.X series.
    section header has a variable definition on the same line, lost
    that variable definition.
 
+ * "git rebase -p --onto" used to always leave side branches of a merge
+   intact, even when both branches are subject to rewriting.
+
  * "git repack" used to faithfully follow grafts and considered true
    parents recorded in the commit object unreachable from the commit.
    After such a repacking, you cannot remove grafts without corrupting
    the repository.
 
  * "git send-email" did not detect erroneous loops in alias expansion.
-
----
-exec >/var/tmp/1
-echo O=$(git describe master)
-O=v1.6.4-rc2-31-g2ceb639
-git shortlog --no-merges $O..master ^maint
diff --git a/diff-format.txt b/diff-format.txt
@@ -1,4 +1,7 @@
-The output format from "git-diff-index", "git-diff-tree",
+Raw output format
+-----------------
+
+The raw output format from "git-diff-index", "git-diff-tree",
 "git-diff-files" and "git diff --raw" are very similar.
 
 These commands all compare two sets of things; what is
@@ -16,6 +19,9 @@ git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
 git-diff-files [<pattern>...]::
         compares the index and the files on the filesystem.
 
+The "git-diff-tree" command begins its ouput by printing the hash of
+what is being compared. After that, all the commands print one output
+line per changed file.
 
 An output line is formatted this way:
 
diff --git a/git-diff-files.html b/git-diff-files.html
@@ -868,9 +868,9 @@ <h2 id="_options">OPTIONS</h2>
 </dd>
 </dl></div>
 </div>
-<h2 id="_output_format">Output format</h2>
+<h2 id="_raw_output_format">Raw output format</h2>
 <div class="sectionbody">
-<div class="para"><p>The output format from "git-diff-index", "git-diff-tree",
+<div class="para"><p>The raw output format from "git-diff-index", "git-diff-tree",
 "git-diff-files" and "git diff --raw" are very similar.</p></div>
 <div class="para"><p>These commands all compare two sets of things; what is
 compared differs:</p></div>
@@ -908,6 +908,9 @@ <h2 id="_output_format">Output format</h2>
 </p>
 </dd>
 </dl></div>
+<div class="para"><p>The "git-diff-tree" command begins its ouput by printing the hash of
+what is being compared. After that, all the commands print one output
+line per changed file.</p></div>
 <div class="para"><p>An output line is formatted this way:</p></div>
 <div class="listingblock">
 <div class="content">
@@ -1410,7 +1413,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-07-01 02:30:48 UTC
+Last updated 2009-07-29 08:35:00 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-files.txt b/git-diff-files.txt
@@ -43,8 +43,7 @@ omit diff output for unmerged entries and just show "Unmerged".
 -q::
 	Remain silent even on nonexistent files
 
-Output format
--------------
+
 include::diff-format.txt[]
 
 
diff --git a/git-diff-index.html b/git-diff-index.html
@@ -852,9 +852,9 @@ <h2 id="_options">OPTIONS</h2>
 </dd>
 </dl></div>
 </div>
-<h2 id="_output_format">Output format</h2>
+<h2 id="_raw_output_format">Raw output format</h2>
 <div class="sectionbody">
-<div class="para"><p>The output format from "git-diff-index", "git-diff-tree",
+<div class="para"><p>The raw output format from "git-diff-index", "git-diff-tree",
 "git-diff-files" and "git diff --raw" are very similar.</p></div>
 <div class="para"><p>These commands all compare two sets of things; what is
 compared differs:</p></div>
@@ -892,6 +892,9 @@ <h2 id="_output_format">Output format</h2>
 </p>
 </dd>
 </dl></div>
+<div class="para"><p>The "git-diff-tree" command begins its ouput by printing the hash of
+what is being compared. After that, all the commands print one output
+line per changed file.</p></div>
 <div class="para"><p>An output line is formatted this way:</p></div>
 <div class="listingblock">
 <div class="content">
@@ -1488,7 +1491,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-07-01 02:30:48 UTC
+Last updated 2009-07-29 08:35:00 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-index.txt b/git-diff-index.txt
@@ -34,8 +34,6 @@ include::diff-options.txt[]
 	'git-diff-index' say that all non-checked-out files are up
 	to date.
 
-Output format
--------------
 include::diff-format.txt[]
 
 Operating Modes
diff --git a/git-diff-tree.html b/git-diff-tree.html
@@ -1427,9 +1427,9 @@ <h2 id="_limiting_output">Limiting Output</h2>
 </div></div>
 <div class="para"><p>in case you care).</p></div>
 </div>
-<h2 id="_output_format">Output format</h2>
+<h2 id="_raw_output_format">Raw output format</h2>
 <div class="sectionbody">
-<div class="para"><p>The output format from "git-diff-index", "git-diff-tree",
+<div class="para"><p>The raw output format from "git-diff-index", "git-diff-tree",
 "git-diff-files" and "git diff --raw" are very similar.</p></div>
 <div class="para"><p>These commands all compare two sets of things; what is
 compared differs:</p></div>
@@ -1467,6 +1467,9 @@ <h2 id="_output_format">Output format</h2>
 </p>
 </dd>
 </dl></div>
+<div class="para"><p>The "git-diff-tree" command begins its ouput by printing the hash of
+what is being compared. After that, all the commands print one output
+line per changed file.</p></div>
 <div class="para"><p>An output line is formatted this way:</p></div>
 <div class="listingblock">
 <div class="content">
@@ -1969,7 +1972,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-07-01 02:30:48 UTC
+Last updated 2009-07-29 08:35:00 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-tree.txt b/git-diff-tree.txt
@@ -159,8 +159,7 @@ HEAD commits it finds, which is even more interesting.
 
 in case you care).
 
-Output format
--------------
+
 include::diff-format.txt[]
 
 
diff --git a/git-diff.html b/git-diff.html
@@ -914,9 +914,9 @@ <h2 id="_options">OPTIONS</h2>
 </dd>
 </dl></div>
 </div>
-<h2 id="_output_format">Output format</h2>
+<h2 id="_raw_output_format">Raw output format</h2>
 <div class="sectionbody">
-<div class="para"><p>The output format from "git-diff-index", "git-diff-tree",
+<div class="para"><p>The raw output format from "git-diff-index", "git-diff-tree",
 "git-diff-files" and "git diff --raw" are very similar.</p></div>
 <div class="para"><p>These commands all compare two sets of things; what is
 compared differs:</p></div>
@@ -954,6 +954,9 @@ <h2 id="_output_format">Output format</h2>
 </p>
 </dd>
 </dl></div>
+<div class="para"><p>The "git-diff-tree" command begins its ouput by printing the hash of
+what is being compared. After that, all the commands print one output
+line per changed file.</p></div>
 <div class="para"><p>An output line is formatted this way:</p></div>
 <div class="listingblock">
 <div class="content">
@@ -1604,7 +1607,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-07-01 02:30:49 UTC
+Last updated 2009-07-29 08:35:00 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff.txt b/git-diff.txt
@@ -84,8 +84,7 @@ include::diff-options.txt[]
 	the diff to the named paths (you can give directory
 	names and get diff for all files under them).
 
-Output format
--------------
+
 include::diff-format.txt[]
 
 EXAMPLES
diff --git a/git-rerere.html b/git-rerere.html
@@ -337,7 +337,7 @@ <h2 id="_description">DESCRIPTION</h2>
 <td class="icon">
 <div class="title">Note</div>
 </td>
-<td class="content">You need to set the configuration variable rerere.enabled to
+<td class="content">You need to set the configuration variable rerere.enabled in order to
 enable this command.</td>
 </tr></table>
 </div>
@@ -528,7 +528,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-07-01 02:31:00 UTC
+Last updated 2009-07-29 08:35:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-rerere.txt b/git-rerere.txt
@@ -23,7 +23,7 @@ on the initial manual merge, and applying previously recorded
 hand resolutions to their corresponding automerge results.
 
 [NOTE]
-You need to set the configuration variable rerere.enabled to
+You need to set the configuration variable rerere.enabled in order to
 enable this command.
 
 
diff --git a/git.html b/git.html
@@ -2044,7 +2044,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-07-01 02:31:07 UTC
+Last updated 2009-07-29 08:35:01 UTC
 </div>
 </div>
 </body>
diff --git a/git.txt b/git.txt
@@ -43,9 +43,15 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.6.3.3/git.html[documentation for release 1.6.3.3]
+* link:v1.6.4/git.html[documentation for release 1.6.4]
 
 * release notes for
+  link:RelNotes-1.6.4.txt[1.6.4].
+
+* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
+
+* release notes for
+  link:RelNotes-1.6.3.4.txt[1.6.3.4],
   link:RelNotes-1.6.3.3.txt[1.6.3.3],
   link:RelNotes-1.6.3.2.txt[1.6.3.2],
   link:RelNotes-1.6.3.1.txt[1.6.3.1],
