From 02f130bd23751fc40d2c784821e3f05536363d7c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 14 Jul 2007 08:26:56 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc1-16-g9d6f --- git-diff-tree.html | 12 +++++++++++- git-log.html | 12 +++++++++++- git-rev-list.html | 20 +++++++++++++++++--- git-rev-list.txt | 11 +++++++++-- git-rm.html | 5 +++-- git-rm.txt | 3 ++- git-show.html | 12 +++++++++++- pretty-formats.txt | 2 ++ 8 files changed, 66 insertions(+), 11 deletions(-) diff --git a/git-diff-tree.html b/git-diff-tree.html index 34f61ecfc..3b40facb0 100644 --- 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

  • +%ai: author date, ISO 8601 format +

    +
    • +
  • +

    %cn: committer name

    • @@ -1089,6 +1094,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%ci: committer date, ISO 8601 format +

    +
    • +
  • +

    %e: encoding

    • @@ -1554,7 +1564,7 @@ two unresolved merge parents with the working tree file diff --git a/git-log.html b/git-log.html index a5dfef5a5..01aefc5f1 100644 --- a/git-log.html +++ b/git-log.html @@ -612,6 +612,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%ai: author date, ISO 8601 format +

    +
    • +
  • +

    %cn: committer name

    • @@ -642,6 +647,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%ci: committer date, ISO 8601 format +

    +
    • +
  • +

    %e: encoding

    • @@ -830,7 +840,7 @@ reversible operation.

    diff --git a/git-rev-list.html b/git-rev-list.html index bb8df2cde..92e9498a1 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -292,7 +292,7 @@ git-rev-list(1) Manual Page [ --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 ] @@ -390,7 +390,7 @@ people using 80-column terminals.

    ---date={relative,local,default} +--date={relative,local,default,iso,rfc}

    @@ -400,6 +400,10 @@ people using 80-column terminals.

    --date=relative shows dates relative to the current time, 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).

    @@ -1018,6 +1022,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%ai: author date, ISO 8601 format +

    +
    • +
  • +

    %cn: committer name

    • @@ -1048,6 +1057,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%ci: committer date, ISO 8601 format +

    +
    • +
  • +

    %e: encoding

    • @@ -1110,7 +1124,7 @@ and the git-list <git@vger.kernel.org>.

    diff --git a/git-rev-list.txt b/git-rev-list.txt index 20dcac625..08e7573b9 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -28,7 +28,7 @@ SYNOPSIS [ \--encoding[=] ] [ \--(author|committer|grep)= ] [ \--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 728b9531a..ccf0d8d92 100644 --- a/git-rm.html +++ b/git-rm.html @@ -279,7 +279,8 @@ git-rm(1) Manual Page

    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

    @@ -414,7 +415,7 @@ git-rm -f git-*.sh
    diff --git a/git-rm.txt b/git-rm.txt index 78f45dca2..be61a8216 100644 --- 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 4faf1b497..df8032c44 100644 --- a/git-show.html +++ b/git-show.html @@ -542,6 +542,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%ai: author date, ISO 8601 format +

    +
    • +
  • +

    %cn: committer name

    • @@ -572,6 +577,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%ci: committer date, ISO 8601 format +

    +
    • +
  • +

    %e: encoding

    • @@ -752,7 +762,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    diff --git a/pretty-formats.txt b/pretty-formats.txt index c551ea61d..0193c3ce5 100644 --- 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 -- 2.26.2