Autogenerated HTML docs for v1.5.1-rc3-20-gaa453

diff --git a/RelNotes-1.5.1.txt b/RelNotes-1.5.1.txt
index 8461fb4371f9f5ad37570d8a10fc187c20110d67..f48d816c7bf44ca8c73a769e4f9c5e1083585631 100644 (file)
--- a/RelNotes-1.5.1.txt
+++ b/RelNotes-1.5.1.txt
@@ -86,11 +86,16 @@ Updates since v1.5.0
     to run after each revision is checked out to determine if it
     is good or bad, to automate the bisection process.
 
+  - "git log" family learned a new traversal option --first-parent,
+    which does what the name suggests.
+
 
 * Updated behaviour of existing commands.
 
   - "git fsck" does not barf on corrupt loose objects.
 
+  - "git rm" does not remove newly added files without -f.
+
   - "git archimport" allows remapping when coming up with git
     branch names from arch names.
 
@@ -183,7 +188,7 @@ Updates since v1.5.0
 
 --
 exec >/var/tmp/1
-O=v1.5.1-rc1-63-g12d6697
+O=v1.5.1-rc3-18-ge881192
 echo O=`git describe master`
 git shortlog --no-merges $O..master ^maint
 

diff --git a/git-mergetool.html b/git-mergetool.html
index 32065ec25a330dbf0dd9f307bf41018fb0449ce7..8474580776cc2d7b9be41fcab5f4f461bda5854b 100644 (file)
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -295,13 +295,10 @@ with merge conflicts.</p>
         Valid merge tools are:\r
         kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.\r
 </p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>If a merge resolution program is not specified, 'git mergetool'\r
+<p>If a merge resolution program is not specified, <em>git mergetool</em>\r
 will use the configuration variable merge.tool.  If the\r
-configuration variable merge.tool is not set, 'git mergetool'\r
-will pick a suitable default.</tt></pre>\r
-</div></div>\r
+configuration variable merge.tool is not set, <em>git mergetool</em>\r
+will pick a suitable default.</p>\r
 </dd>\r
 </dl>\r
 </div>\r
@@ -319,7 +316,7 @@ will pick a suitable default.</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Mar-2007 10:43:14 UTC\r
+Last updated 30-Mar-2007 08:52:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mergetool.txt b/git-mergetool.txt
index 5baaaca0b5433ae279b3961d72d0cffa8ca046e3..34288fe08b3962554178fd8a6baa8f7030096baf 100644 (file)
--- a/git-mergetool.txt
+++ b/git-mergetool.txt
@@ -26,11 +26,11 @@ OPTIONS
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:
        kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
-
-       If a merge resolution program is not specified, 'git mergetool'
-       will use the configuration variable merge.tool.  If the
-       configuration variable merge.tool is not set, 'git mergetool'
-       will pick a suitable default.
++
+If a merge resolution program is not specified, 'git mergetool'
+will use the configuration variable merge.tool.  If the
+configuration variable merge.tool is not set, 'git mergetool'
+will pick a suitable default.
 
 Author
 ------

diff --git a/git-rev-parse.html b/git-rev-parse.html
index 78422066fd946efd89f7cff21174fda450c453e3..dd187e412aac1b1ebf2d83e5711839619d28f534 100644 (file)
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -684,14 +684,14 @@ its all parents.</p>
 <p>Here are a handful examples:</p>\r
 <div class="literalblock">\r
 <div class="content">\r
-<pre><tt>D                A B D\r
-D F              A B C D F\r
-^A G             B D\r
-^A F             B C F\r
-G...I            C D F G I\r
-^B G I           C D F G I\r
-F^@              A B C\r
-F^! H            D F H</tt></pre>\r
+<pre><tt>D                G H D\r
+D F              G H I J D F\r
+^G D             H D\r
+^D B             E I J F B\r
+B...C            G H D E B C\r
+^D B C           E I J F B C\r
+C^@              I J F\r
+F^! D            G H D F</tt></pre>\r
 </div></div>\r
 </div>\r
 <h2>Author</h2>\r
@@ -709,7 +709,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Mar-2007 01:24:43 UTC\r
+Last updated 30-Mar-2007 08:52:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index ccc66aae7f11bafb6a56e102081020d73b5e4db7..a8bf6561e1d8059f12d1a548cf74dc4815e6a34f 100644 (file)
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -265,14 +265,14 @@ its all parents.
 
 Here are a handful examples:
 
-   D                A B D
-   D F              A B C D F
-   ^A G             B D
-   ^A F             B C F
-   G...I            C D F G I
-   ^B G I           C D F G I
-   F^@              A B C
-   F^! H            D F H
+   D                G H D
+   D F              G H I J D F
+   ^G D             H D
+   ^D B             E I J F B
+   B...C            G H D E B C
+   ^D B C           E I J F B C
+   C^@              I J F
+   F^! D            G H D F
 
 Author
 ------

diff --git a/git-svnimport.html b/git-svnimport.html
index 4e08b10642e6a4e14d113f602530980547e1a3b4..3ddd2099215e3f8dfa6b55b9f070438dd5383e23 100644 (file)
--- a/git-svnimport.html
+++ b/git-svnimport.html
@@ -287,7 +287,7 @@ git-svnimport(1) Manual Page
 repository, or incrementally import into an existing one.</p>\r
 <p>SVN access is done by the SVN::Perl module.</p>\r
 <p>git-svnimport assumes that SVN repositories are organized into one\r
-"trunk" directory where the main development happens, "branch/FOO"\r
+"trunk" directory where the main development happens, "branches/FOO"\r
 directories for branches, and "/tags/FOO" directories for tags.\r
 Other subdirectories are ignored.</p>\r
 <p>git-svnimport creates a file ".git/svn2git", which is required for\r
@@ -534,7 +534,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2007 07:43:49 UTC\r
+Last updated 30-Mar-2007 08:52:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svnimport.txt b/git-svnimport.txt
index b166cf3327380a8f386825a7fbce92f2447bb54e..bdae7d87dce5d07d0d31b45f127fa43a239a6632 100644 (file)
--- a/git-svnimport.txt
+++ b/git-svnimport.txt
@@ -27,7 +27,7 @@ repository, or incrementally import into an existing one.
 SVN access is done by the SVN::Perl module.
 
 git-svnimport assumes that SVN repositories are organized into one
-"trunk" directory where the main development happens, "branch/FOO"
+"trunk" directory where the main development happens, "branches/FOO"
 directories for branches, and "/tags/FOO" directories for tags.
 Other subdirectories are ignored.
 

diff --git a/git.html b/git.html
index d8e343fb8ce31457c2911b4ccbe48187b27981e3..34ea71136ead440c4b49d69b4277df112fdc9aaa 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2317,7 +2317,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Mar-2007 01:09:27 UTC\r
+Last updated 30-Mar-2007 08:52:09 UTC\r
 </div>\r
 </div>\r
 </body>\r