diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-29 00:16:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-29 00:16:39 -0700 |
| commit | 445cac18c015809a7fcb4a570d3c6571b1ddaf7d (patch) | |
| tree | 89eeb8e6618d9eb582ea5bd1a2cf781625ebc001 /Documentation/pretty-formats.txt | |
| parent | git-p4: Fix checkout bug when using --import-local. (diff) | |
| parent | tutorial: gentler illustration of Alice/Bob workflow using gitk (diff) | |
| download | tgif-445cac18c015809a7fcb4a570d3c6571b1ddaf7d.tar.xz | |
Merge branch 'maint'
* maint:
tutorial: gentler illustration of Alice/Bob workflow using gitk
pretty=format: respect date format options
make git-shell paranoid about closed stdin/stdout/stderr
Document gitk --argscmd flag.
Fix '--dirstat' with cross-directory renaming
for-each-ref: Allow a trailing slash in the patterns
Diffstat (limited to 'Documentation/pretty-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index c11d495771..388d4925e6 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -103,7 +103,7 @@ The placeholders are: - '%an': author name - '%aN': author name (respecting .mailmap) - '%ae': author email -- '%ad': author date +- '%ad': author date (format respects --date= option) - '%aD': author date, RFC2822 style - '%ar': author date, relative - '%at': author date, UNIX timestamp |