Autogenerated HTML docs for v1.5.3-rc1-16-g9d6f

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 34f61ecfc66787a12eb2890ad497ca4ed12d0d03..3b40facb0c98db1e3543ffd235a32d1e7b94523e 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1059,6 +1059,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%ai</em>: author date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%cn</em>: committer name\r
 </p>\r
 </li>\r
@@ -1089,6 +1094,11 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%ci</em>: committer date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%e</em>: encoding\r
 </p>\r
 </li>\r
@@ -1554,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 04-Jul-2007 06:40:53 UTC\r
+Last updated 14-Jul-2007 08:26:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index a5dfef5a568740feb92b7a8af778f3d6becb197b..01aefc5f1285377e8de6e78b22098184968132e9 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -612,6 +612,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%ai</em>: author date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%cn</em>: committer name\r
 </p>\r
 </li>\r
@@ -642,6 +647,11 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%ci</em>: committer date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%e</em>: encoding\r
 </p>\r
 </li>\r
@@ -830,7 +840,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Jul-2007 00:24:26 UTC\r
+Last updated 14-Jul-2007 08:26:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.html b/git-rev-list.html
index bb8df2cde1cca9d32135deb70a374953a817db2e..92e9498a13209180e0834f793b072c295a386b64 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -292,7 +292,7 @@ git-rev-list(1) Manual Page
              [ --encoding[=<encoding>] ]\r
              [ --(author|committer|grep)=<pattern> ]\r
              [ --regexp-ignore-case ] [ --extended-regexp ]\r
-             [ --date={local|relative|default} ]\r
+             [ --date={local|relative|default|iso|rfc|short} ]\r
              [ [--objects | --objects-edge] [ --unpacked ] ]\r
              [ --pretty | --header ]\r
              [ --bisect ]\r
@@ -390,7 +390,7 @@ people using 80-column terminals.</p>
 </p>\r
 </dd>\r
 <dt>\r
---date={relative,local,default}\r
+--date={relative,local,default,iso,rfc}\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -400,6 +400,10 @@ people using 80-column terminals.</p>
 <p><tt>--date=relative</tt> shows dates relative to the current time,\r
 e.g. "2 hours ago".</p>\r
 <p><tt>--date=local</tt> shows timestamps in user's local timezone.</p>\r
+<p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p>\r
+<p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822\r
+format, often found in E-mail messages.</p>\r
+<p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> fomat.</p>\r
 <p><tt>--date=default</tt> shows timestamps in the original timezone\r
 (either committer's or author's).</p>\r
 </dd>\r
@@ -1018,6 +1022,11 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%ai</em>: author date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%cn</em>: committer name\r
 </p>\r
 </li>\r
@@ -1048,6 +1057,11 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%ci</em>: committer date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%e</em>: encoding\r
 </p>\r
 </li>\r
@@ -1110,7 +1124,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 03-Jul-2007 07:03:44 UTC\r
+Last updated 14-Jul-2007 08:26:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index 20dcac625204869cf6c426d338f2fafd567368b9..08e7573b9e1beffceef9d44b047cba3466653b22 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -28,7 +28,7 @@ SYNOPSIS
             [ \--encoding[=<encoding>] ]
             [ \--(author|committer|grep)=<pattern> ]
             [ \--regexp-ignore-case ] [ \--extended-regexp ]
-            [ \--date={local|relative|default} ]
+            [ \--date={local|relative|default|iso|rfc|short} ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
@@ -96,7 +96,7 @@ include::pretty-options.txt[]
 
        Synonym for `--date=relative`.
 
---date={relative,local,default}::
+--date={relative,local,default,iso,rfc}::
 
        Only takes effect for dates shown in human-readable format, such
        as when using "--pretty".
@@ -106,6 +106,13 @@ e.g. "2 hours ago".
 +
 `--date=local` shows timestamps in user's local timezone.
 +
+`--date=iso` (or `--date=iso8601`) shows timestamps in ISO 8601 format.
++
+`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
+format, often found in E-mail messages.
++
+`--date=short` shows only date but not time, in `YYYY-MM-DD` fomat.
++
 `--date=default` shows timestamps in the original timezone
 (either committer's or author's).
 

diff --git a/git-rm.html b/git-rm.html
index 728b9531a621a7d32fcb0946bb7ff03172d90bbb..ccf0d8d92770c6476f01159a7375c5a95466c6f6 100644 (file)
--- a/git-rm.html
+++ b/git-rm.html
@@ -279,7 +279,8 @@ git-rm(1) Manual Page
 <p>Remove files from the working tree and from the index.  The\r
 files have to be identical to the tip of the branch, and no\r
 updates to its contents must have been placed in the staging\r
-area (aka index).</p>\r
+area (aka index).  When --cached is given, the staged content has to\r
+match either the tip of the branch <strong>or</strong> the file on disk.</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -414,7 +415,7 @@ git-rm -f git-*.sh
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:49:21 UTC\r
+Last updated 14-Jul-2007 08:26:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rm.txt b/git-rm.txt
index 78f45dca2e37415cbeafb02db559edc6ca511d51..be61a821642ada0a0e8e3303aa81463c716fd970 100644 (file)
--- a/git-rm.txt
+++ b/git-rm.txt
@@ -14,7 +14,8 @@ DESCRIPTION
 Remove files from the working tree and from the index.  The
 files have to be identical to the tip of the branch, and no
 updates to its contents must have been placed in the staging
-area (aka index).
+area (aka index).  When --cached is given, the staged content has to
+match either the tip of the branch *or* the file on disk.
 
 
 OPTIONS

diff --git a/git-show.html b/git-show.html
index 4faf1b49764e0a88f1e7efb69f42d72ad4eca155..df8032c444d7feffc196247ae4252ba90c48d9dd 100644 (file)
--- a/git-show.html
+++ b/git-show.html
@@ -542,6 +542,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%ai</em>: author date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%cn</em>: committer name\r
 </p>\r
 </li>\r
@@ -572,6 +577,11 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%ci</em>: committer date, ISO 8601 format\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%e</em>: encoding\r
 </p>\r
 </li>\r
@@ -752,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 21-Jun-2007 00:35:01 UTC\r
+Last updated 14-Jul-2007 08:26:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/pretty-formats.txt b/pretty-formats.txt
index c551ea61d2870e6e4d5471ec4fcbca4fbd802b09..0193c3ce58de4f51a164d43e68023fdf5639a920 100644 (file)
--- a/pretty-formats.txt
+++ b/pretty-formats.txt
@@ -106,12 +106,14 @@ The placeholders are:
 - '%aD': author date, RFC2822 style
 - '%ar': author date, relative
 - '%at': author date, UNIX timestamp
+- '%ai': author date, ISO 8601 format
 - '%cn': committer name
 - '%ce': committer email
 - '%cd': committer date
 - '%cD': committer date, RFC2822 style
 - '%cr': committer date, relative
 - '%ct': committer date, UNIX timestamp
+- '%ci': committer date, ISO 8601 format
 - '%e': encoding
 - '%s': subject
 - '%b': body