Autogenerated HTML docs for v1.5.3-rc3

diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt
index 896ff1d95a2a307fd764b66de4fbd882e64dd9c6..785bd38455140d962f646717bb5d5f3c8e602d21 100644 (file)
--- a/RelNotes-1.5.3.txt
+++ b/RelNotes-1.5.3.txt
@@ -32,8 +32,9 @@ Updates since v1.5.2
   - "git rebase" learned an "interactive" mode that let you
     pick and reorder which commits to rebuild.
 
-  - "git fsck" can save its findings in $GIT_DIR/lost-found,
-    without a separate invocation of "git lost-found" command.
+  - "git fsck" can save its findings in $GIT_DIR/lost-found, without a
+    separate invocation of "git lost-found" command.  The blobs stored by
+    lost-found are stored in plain format to allow you to grep in them.
 
   - $GIT_WORK_TREE environment variable can be used together with
     $GIT_DIR to work in a subdirectory of a working tree that is
@@ -49,6 +50,10 @@ Updates since v1.5.2
   - "git-cvsserver" learned new options (--base-path, --export-all,
     --strict-paths) inspired by git-daemon.
 
+  - "git-commit" can use "-t templatefile" option and commit.template
+    configuration variable to prime the commit message given to you in the
+    editor.
+
   - "git-submodule" command helps you manage the projects from
     the superproject that contain them.
 
@@ -105,9 +110,30 @@ Updates since v1.5.2
 
 * Updated behavior of existing commands.
 
+  - "gitweb" can offer multiple snapshot formats.
+
+    ***NOTE*** Unfortunately, this changes the format of the
+    $feature{snapshot}{default} entry in the per-site
+    configuration file 'gitweb_config.perl'.  It used to be a
+    three-element tuple that describe a single format; with the
+    new configuration item format, you only have to say the name
+    of the format ('tgz', 'tbz2' or 'zip').  Please update the
+    your configuration file accordingly.
+
+  - The editor to use with many interactive commands can be
+    overridden with GIT_EDITOR environment variable, or if it
+    does not exist, with core.editor configuration variable.  As
+    before, if you have neither, environment variables VISUAL
+    and EDITOR are consulted in this order, and then finally we
+    fall back on "vi".
+
   - "git rm --cached" does not complain when removing a newly
     added file from the index anymore.
 
+  - Options to "git log" to affect how --grep/--author options look for
+    given strings now have shorter abbreviations.  -i is for ignore case,
+    and -E is for extended regexp.
+
   - "git svn dcommit" retains local merge information.
 
   - "git config" to set values also honors type flags like --bool
@@ -189,6 +215,10 @@ Updates since v1.5.2
     git-fast-import (also in contrib).  The man page and p4
     rpm have been removed as well.
 
+  - "git mailinfo" (hence "am") now tries to see if the message
+    is in utf-8 first, instead of assuming iso-8859-1, if
+    incoming e-mail does not say what encoding it is in.
+
 * Builds
 
   - old-style function definitions (most notably, a function
@@ -232,6 +262,6 @@ this release, unless otherwise noted.
 
 --
 exec >/var/tmp/1
-O=v1.5.3-rc2
+O=v1.5.3-rc3
 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 f528785bca3b459a7e717e53170fc606f5b51a11..af283396a281dd0b37015750654f4b4b52df1e02 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -380,6 +380,19 @@ that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p
 </p>\r
 </dd>\r
 <dt>\r
+-t &lt;file&gt;|--template=&lt;file&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Use the contents of the given file as the initial version\r
+        of the commit message. The editor is invoked and you can\r
+        make subsequent changes. If a message is specified using\r
+        the <tt>-m</tt> or <tt>-F</tt> options, this option has no effect. The\r
+        template file may also be specified using the <tt>commit.template</tt>\r
+        configuration variable.\r
+</p>\r
+</dd>\r
+<dt>\r
 -s|--signoff\r
 </dt>\r
 <dd>\r
@@ -689,7 +702,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 20-Jul-2007 10:27:37 UTC\r
+Last updated 25-Jul-2007 08:53:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.txt b/git-commit.txt
index 8e0e7e2d0400b85b05c7e684bc87d9f5f1279e4a..3f36c6782fff2993d83fb2134234f263b0f33120 100644 (file)
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -74,6 +74,14 @@ OPTIONS
 -m <msg>|--message=<msg>::
        Use the given <msg> as the commit message.
 
+-t <file>|--template=<file>::
+       Use the contents of the given file as the initial version
+       of the commit message. The editor is invoked and you can
+       make subsequent changes. If a message is specified using
+       the `-m` or `-F` options, this option has no effect. The
+       template file may also be specified using the `commit.template`
+       configuration variable.
+
 -s|--signoff::
        Add Signed-off-by line at the end of the commit message.
 

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 89ca5b1a7b07b41ab17dc81edf4cbab0a07a0f23..bd505f8167acfea135183f83a5e348b25b2b4d46 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -775,10 +775,10 @@ separated with a single space are given.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Pretty print the contents of the commit logs in a given format,\r
+        Pretty-print the contents of the commit logs in a given format,\r
         where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,\r
         <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.\r
-        When left out the format default to <em>medium</em>.\r
+        When omitted, the format defaults to <em>medium</em>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1564,7 +1564,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:38 UTC\r
+Last updated 25-Jul-2007 08:53:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index 3e7996d83a791811d1f6b7299a56022c494e3001..c81a655206d22cdcb9277c640e5270e1c4395098 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -291,10 +291,10 @@ each commit introduces are shown.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Pretty print the contents of the commit logs in a given format,\r
+        Pretty-print the contents of the commit logs in a given format,\r
         where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,\r
         <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.\r
-        When left out the format default to <em>medium</em>.\r
+        When omitted, the format defaults to <em>medium</em>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -840,7 +840,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:44 UTC\r
+Last updated 25-Jul-2007 08:53:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.html b/git-rev-list.html
index d49e2b6a61669096631391c0fdbb7b3376900b27..e8c44d1380141aaa24a4328ed3e80504cb090fc1 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -352,10 +352,10 @@ more specialized family of commit log tools: <a href="git-log.html">git-log(1)</
 </dt>\r
 <dd>\r
 <p>\r
-        Pretty print the contents of the commit logs in a given format,\r
+        Pretty-print the contents of the commit logs in a given format,\r
         where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,\r
         <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.\r
-        When left out the format default to <em>medium</em>.\r
+        When omitted, the format defaults to <em>medium</em>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1142,7 +1142,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 24-Jul-2007 08:10:05 UTC\r
+Last updated 25-Jul-2007 08:53:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show.html b/git-show.html
index 7cb235b0a8d0c6d34637a066961fb954539ef0d4..a8dcc1b35ac04bb03a39defc2292fdad99ce0843 100644 (file)
--- a/git-show.html
+++ b/git-show.html
@@ -306,10 +306,10 @@ control how the changes the commit introduces are shown.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Pretty print the contents of the commit logs in a given format,\r
+        Pretty-print the contents of the commit logs in a given format,\r
         where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,\r
         <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.\r
-        When left out the format default to <em>medium</em>.\r
+        When omitted, the format defaults to <em>medium</em>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -762,7 +762,7 @@ Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:55 UTC\r
+Last updated 25-Jul-2007 08:53:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/pretty-options.txt b/pretty-options.txt
index 746bc5b7f9a3f96ea321586e095a4fc8ccb6e73f..973d8dd733f954abf93aac7c68efef1154e9f315 100644 (file)
--- a/pretty-options.txt
+++ b/pretty-options.txt
@@ -1,9 +1,9 @@
 --pretty[='<format>']::
 
-       Pretty print the contents of the commit logs in a given format,
+       Pretty-print the contents of the commit logs in a given format,
        where '<format>' can be one of 'oneline', 'short', 'medium',
        'full', 'fuller', 'email', 'raw' and 'format:<string>'.
-       When left out the format default to 'medium'.
+       When omitted, the format defaults to 'medium'.
 
 --abbrev-commit::
        Instead of showing the full 40-byte hexadecimal commit object