summaryrefslogtreecommitdiffstats
path: root/Documentation/pretty-formats.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 20:38:32 +0200
committerJunio C Hamano <gitster@pobox.com>2014-09-19 20:38:32 +0200
commitceeacc501bc64dcdff180a9250bf2fcea3582837 (patch)
tree5934e97fc45082bc333c21e7dac5ca936112306a /Documentation/pretty-formats.txt
parentMerge branch 'mb/build-contrib-svn-fe' (diff)
parentpretty: provide a strict ISO 8601 date format (diff)
downloadgit-ceeacc501bc64dcdff180a9250bf2fcea3582837.tar.xz
git-ceeacc501bc64dcdff180a9250bf2fcea3582837.zip
Merge branch 'bb/date-iso-strict'
"log --date=iso" uses a slight variant of ISO 8601 format that is made more human readable. A new "--date=iso-strict" option gives datetime output that is more strictly conformant. * bb/date-iso-strict: pretty: provide a strict ISO 8601 date format
Diffstat (limited to 'Documentation/pretty-formats.txt')
-rw-r--r--Documentation/pretty-formats.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index eac79096d3..6c30723740 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -115,7 +115,8 @@ The placeholders are:
- '%aD': author date, RFC2822 style
- '%ar': author date, relative
- '%at': author date, UNIX timestamp
-- '%ai': author date, ISO 8601 format
+- '%ai': author date, ISO 8601-like format
+- '%aI': author date, strict ISO 8601 format
- '%cn': committer name
- '%cN': committer name (respecting .mailmap, see
linkgit:git-shortlog[1] or linkgit:git-blame[1])
@@ -126,7 +127,8 @@ The placeholders are:
- '%cD': committer date, RFC2822 style
- '%cr': committer date, relative
- '%ct': committer date, UNIX timestamp
-- '%ci': committer date, ISO 8601 format
+- '%ci': committer date, ISO 8601-like format
+- '%cI': committer date, strict ISO 8601 format
- '%d': ref names, like the --decorate option of linkgit:git-log[1]
- '%e': encoding
- '%s': subject