Autogenerated HTML docs for v1.5.4-rc2

diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt
index 528b26f7c7a6f8476e261040dcffe08d10e331cc..e6fbcdb2e17b061163ddb0f8c218a395480ea572 100644 (file)
--- a/RelNotes-1.5.4.txt
+++ b/RelNotes-1.5.4.txt
@@ -91,6 +91,16 @@ Updates since v1.5.3
  * "git diff" Porcelain now respects diff.external configuration, which
    is another way to specify GIT_EXTERNAL_DIFF.
 
+ * "git diff" can be told to use different prefixes other than
+   "a/" and "b/" e.g. "git diff --src-prefix=l/ --dst-prefix=k/".
+
+ * "git diff" sometimes did not quote paths with funny
+   characters properly.
+
+ * "git log" (and any revision traversal commands) misbehaved
+   when --diff-filter is given but was not asked to actually
+   produce diff.
+
  * HTTP proxy can be specified per remote repository using
    remote.*.httpproxy configuration, or global http.proxy configuration
    variable.
@@ -208,6 +218,10 @@ Updates since v1.5.3
  * "git commit --amend" can amend a merge that does not change the tree
    from its first parent.
 
+ * "git commit" used to unconditionally strip comment lines that
+   began with '#' and removed excess blank lines.  This
+   behaviour has been made configurable.
+
  * "git commit" has been rewritten in C.
 
  * "git stash random-text" does not create a new stash anymore.  It was
@@ -251,6 +265,9 @@ Updates since v1.5.3
    reasonable usability fix and people's scripts shouldn't have been
    relying on the exact output from "git show" Porcelain anyway.
 
+ * "git cvsimport" did not notice errors from underlying "cvsps"
+   and produced a corrupt import silently.
+
  * "git cvsexportcommit" learned -w option to specify and switch to the
    CVS working directory.
 
@@ -327,6 +344,6 @@ series.
 
 --
 exec >/var/tmp/1
-O=v1.5.4-rc0-85-gdbedf97
+O=v1.5.4-rc1-36-g49e6be5
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

diff --git a/git-commit.html b/git-commit.html
index 927a775f1e34463b24d93b354f3aaf607b424185..d0a6bbea50d926b5205491b4859a30c5773e877a 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -276,7 +276,7 @@ git-commit(1) Manual Page
 <div class="content"><em>git-commit</em> [-a | --interactive] [-s] [-v] [-u]\r
            [(-c | -C) &lt;commit&gt; | -F &lt;file&gt; | -m &lt;msg&gt; | --amend]\r
            [--allow-empty] [--no-verify] [-e] [--author &lt;author&gt;]\r
-           [--] [[-i | -o ]&lt;file&gt;&#8230;]</div></div>\r
+           [--cleanup=&lt;mode&gt;] [--] [[-i | -o ]&lt;file&gt;&#8230;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -420,6 +420,21 @@ that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p
 </p>\r
 </dd>\r
 <dt>\r
+--cleanup=&lt;mode&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        This option sets how the commit message is cleaned up.\r
+        The  <em>&lt;mode&gt;</em> can be one of <em>verbatim</em>, <em>whitespace</em>, <em>strip</em>,\r
+        and <em>default</em>. The <em>default</em> mode will strip leading and\r
+        trailing empty lines and #commentary from the commit message\r
+        only if the message is to be edited. Otherwise only whitespace\r
+        removed. The <em>verbatim</em> mode does not change message at all,\r
+        <em>whitespace</em> removes just leading/trailing whitespace lines\r
+        and <em>strip</em> removes both whitespace and commentary.\r
+</p>\r
+</dd>\r
+<dt>\r
 -e|--edit\r
 </dt>\r
 <dd>\r
@@ -715,7 +730,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Dec-2007 10:19:07 UTC\r
+Last updated 27-Dec-2007 03:28:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.txt b/git-commit.txt
index 4261384158f53ebe85dc32148b5652dc697e5b3b..96383b6543c781090bc2d4d7cf215c645b08714b 100644 (file)
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 'git-commit' [-a | --interactive] [-s] [-v] [-u]
           [(-c | -C) <commit> | -F <file> | -m <msg> | --amend]
           [--allow-empty] [--no-verify] [-e] [--author <author>]
-          [--] [[-i | -o ]<file>...]
+          [--cleanup=<mode>] [--] [[-i | -o ]<file>...]
 
 DESCRIPTION
 -----------
@@ -95,6 +95,16 @@ OPTIONS
        from making such a commit.  This option bypasses the safety, and
        is primarily for use by foreign scm interface scripts.
 
+--cleanup=<mode>::
+       This option sets how the commit message is cleaned up.
+       The  '<mode>' can be one of 'verbatim', 'whitespace', 'strip',
+       and 'default'. The 'default' mode will strip leading and
+       trailing empty lines and #commentary from the commit message
+       only if the message is to be edited. Otherwise only whitespace
+       removed. The 'verbatim' mode does not change message at all,
+       'whitespace' removes just leading/trailing whitespace lines
+       and 'strip' removes both whitespace and commentary.
+
 -e|--edit::
        The message taken from file with `-F`, command line with
        `-m`, and from file with `-C` are usually used as the

diff --git a/git-log.html b/git-log.html
index 762e8f86a32191587f7614b28ca32d8f6f8fb4f8..fc59725ef858c9040113d554c19f6448fa849e7c 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -791,8 +791,12 @@ people using 80-column terminals.</p>
 <dd>\r
 <p>\r
         Follow only the first parent commit upon seeing a merge\r
-        commit.  This  option gives a better overview of the\r
-        evolution of a particular branch.\r
+        commit.  This option can give a better overview when\r
+        viewing the evolution of a particular topic branch,\r
+        because merges into a topic branch tend to be only about\r
+        adjusting to updated upstream from time to time, and\r
+        this option allows you to ignore the individual commits\r
+        brought in to your history by such a merge.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1473,7 +1477,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Dec-2007 17:56:59 UTC\r
+Last updated 27-Dec-2007 03:28:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.txt b/git-log.txt
index 5920d1799acd2fe84e302b005695e2c795ecad36..d71e51ad46f665a594414aea7e107b4977783e46 100644 (file)
--- a/git-log.txt
+++ b/git-log.txt
@@ -43,8 +43,12 @@ include::diff-options.txt[]
 
 --first-parent::
        Follow only the first parent commit upon seeing a merge
-       commit.  This  option gives a better overview of the
-       evolution of a particular branch.
+       commit.  This option can give a better overview when
+       viewing the evolution of a particular topic branch,
+       because merges into a topic branch tend to be only about
+       adjusting to updated upstream from time to time, and
+       this option allows you to ignore the individual commits
+       brought in to your history by such a merge.
 
 -g, \--walk-reflogs::
        Show commits as they were recorded in the reflog. The log contains

diff --git a/git-rev-list.html b/git-rev-list.html
index 3f9104e332b8277cb2feaa441d5d3e1e16a5d684..5bda7fbbde41ba896beb67698c43fe7568a3febc 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -279,6 +279,7 @@ git-rev-list(1) Manual Page
              [ --min-age=timestamp ]\r
              [ --sparse ]\r
              [ --no-merges ]\r
+             [ --first-parent ]\r
              [ --remove-empty ]\r
              [ --full-history ]\r
              [ --not ]\r
@@ -623,6 +624,20 @@ limiting may be applied.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--first-parent\r
+</dt>\r
+<dd>\r
+<p>\r
+        Follow only the first parent commit upon seeing a merge\r
+        commit.  This option can give a better overview when\r
+        viewing the evolution of a particular topic branch,\r
+        because merges into a topic branch tend to be only about\r
+        adjusting to updated upstream from time to time, and\r
+        this option allows you to ignore the individual commits\r
+        brought in to your history by such a merge.\r
+</p>\r
+</dd>\r
+<dt>\r
 --not\r
 </dt>\r
 <dd>\r
@@ -1175,7 +1190,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 19-Dec-2007 07:33:01 UTC\r
+Last updated 27-Dec-2007 03:28:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index a03f9fe5fadc483f47c2fbd0199f72a9619b5fcd..438dae02e2b79701cee15bf04e28e6157c07d4ab 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -15,6 +15,7 @@ SYNOPSIS
             [ \--min-age=timestamp ]
             [ \--sparse ]
             [ \--no-merges ]
+            [ \--first-parent ]
             [ \--remove-empty ]
             [ \--full-history ]
             [ \--not ]
@@ -256,6 +257,15 @@ limiting may be applied.
 
        Do not print commits with more than one parent.
 
+--first-parent::
+       Follow only the first parent commit upon seeing a merge
+       commit.  This option can give a better overview when
+       viewing the evolution of a particular topic branch,
+       because merges into a topic branch tend to be only about
+       adjusting to updated upstream from time to time, and
+       this option allows you to ignore the individual commits
+       brought in to your history by such a merge.
+
 --not::
 
        Reverses the meaning of the '{caret}' prefix (or lack thereof)