summaryrefslogtreecommitdiffstats
path: root/pretty-formats.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-16 03:23:57 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-16 03:23:57 +0000
commitf5a9362a72a5a586926fce49c90c93a75cbad2b5 (patch)
treed4750ea1466329b97186f9eac8f898611a6fbbad /pretty-formats.txt
parent38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (diff)
downloadgit-htmldocs-f5a9362a72a5a586926fce49c90c93a75cbad2b5.tar.gz
Autogenerated HTML docs for v1.5.6.3-384-gfcab4
Diffstat (limited to 'pretty-formats.txt')
-rw-r--r--pretty-formats.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/pretty-formats.txt b/pretty-formats.txt
index 69e6d2fa4..c11d49577 100644
--- a/pretty-formats.txt
+++ b/pretty-formats.txt
@@ -101,6 +101,7 @@ The placeholders are:
- '%P': parent hashes
- '%p': abbreviated parent hashes
- '%an': author name
+- '%aN': author name (respecting .mailmap)
- '%ae': author email
- '%ad': author date
- '%aD': author date, RFC2822 style
@@ -108,6 +109,7 @@ The placeholders are:
- '%at': author date, UNIX timestamp
- '%ai': author date, ISO 8601 format
- '%cn': committer name
+- '%cN': committer name (respecting .mailmap)
- '%ce': committer email
- '%cd': committer date
- '%cD': committer date, RFC2822 style