Autogenerated HTML docs for v1.5.2-rc3-50-gfdcb7

diff --git a/git-branch.html b/git-branch.html
index f8bd4366fa321e611a0d2e23ceb8c7bddbf60b29..f1803a7fb17af84a98bd1b93a09aca59051cf35b 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -499,7 +499,7 @@ delete remote-tracking branches "todo", "html", "man"
 <li>\r
 <p>\r
 delete "test" branch even if the "master" branch does not have all\r
-commits from todo branch.\r
+commits from test branch.\r
 </p>\r
 </li>\r
 </ol>\r
@@ -526,7 +526,7 @@ a branch and check it out with a single command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:27 UTC\r
+Last updated 16-May-2007 22:46:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.txt b/git-branch.txt
index 603f87f3b59358697da821ffe240be9caff43fa7..8dc5171f5e685ab18d466751710f44e8aba104b7 100644 (file)
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -136,7 +136,7 @@ $ git branch -D test               <2>
 +
 <1> delete remote-tracking branches "todo", "html", "man"
 <2> delete "test" branch even if the "master" branch does not have all
-commits from todo branch.
+commits from test branch.
 
 
 Notes

diff --git a/user-manual.html b/user-manual.html
index 3f672cf41150e7e5c487acfd766dc8a130955391..5406bb8925acb2dcc96bf0617bb27ba36feb1cdd 100644 (file)
--- a/user-manual.html
+++ b/user-manual.html
@@ -540,7 +540,7 @@ $
 $ git diff --theirs file.txt    # same as the above.</p></div><p>The <a href="git-log.html" target="_top">git-log(1)</a> and gitk[1] commands also provide special help
 for merges:</p><div class="literallayout"><p>$ git log --merge<br>
 $ gitk --merge</p></div><p>These will display all commits which exist only on HEAD or on
-MERGE_HEAD, and which touch an unmerged file.</p><p>You may also use gitlink:git-mergetool, which lets you merge the
+MERGE_HEAD, and which touch an unmerged file.</p><p>You may also use <a href="git-mergetool.html" target="_top">git-mergetool(1)</a>, which lets you merge the
 unmerged files using external tools such as emacs or kdiff3.</p><p>Each time you resolve the conflicts in a file and update the index:</p><div class="literallayout"><p>$ git add file.txt</p></div><p>the different stages of that file will be "collapsed", after which
 git-diff will (by default) no longer show diffs for that file.</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="undoing-a-merge"></a>Undoing a merge</h2></div></div></div><p>If you get stuck and decide to just give up and throw the whole mess
 away, you can always return to the pre-merge state with</p><div class="literallayout"><p>$ git reset --hard HEAD</p></div><p>Or, if you've already commited the merge that you want to throw away,</p><div class="literallayout"><p>$ git reset --hard ORIG_HEAD</p></div><p>However, this last command can be dangerous in some cases&#8212;never

diff --git a/user-manual.txt b/user-manual.txt
index a7abeaa1d78beb26d6b293eede8f18cd22c8f509..8d66886335ae74677a41b0ff1a653a9649c5ca42 100644 (file)
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -1357,7 +1357,7 @@ $ gitk --merge
 These will display all commits which exist only on HEAD or on
 MERGE_HEAD, and which touch an unmerged file.
 
-You may also use gitlink:git-mergetool, which lets you merge the
+You may also use gitlink:git-mergetool[1], which lets you merge the
 unmerged files using external tools such as emacs or kdiff3.
 
 Each time you resolve the conflicts in a file and update the index: