Use capitalized names where appropriate

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index ec3755579408ebae58c7de644609590f5636b9c6..0a8a948e6ffba9d15b5db03399f74ed0139394ea 100644 (file)
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -30,7 +30,7 @@ This is designed to be as compact as possible.
 
          commit <sha1>
          Author: <author>
-         Date: <date>
+         Date:   <author date>
 
              <title line>
 
@@ -49,10 +49,10 @@ This is designed to be as compact as possible.
 * 'fuller'
 
          commit <sha1>
-         Author: <author>
-         AuthorDate: <date & time>
-         Commit: <committer>
-         CommitDate: <date & time>
+         Author:     <author>
+         AuthorDate: <author date>
+         Commit:     <committer>
+         CommitDate: <committer date>
 
               <title line>
 
@@ -62,7 +62,7 @@ This is designed to be as compact as possible.
 
          From <sha1> <date>
          From: <author>
-         Date: <date & time>
+         Date: <author date>
          Subject: [PATCH] <title line>
 
          <full commit message>
@@ -101,19 +101,22 @@ 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 (format respects --date= option)
 - '%aD': author date, RFC2822 style
 - '%ar': author date, relative
 - '%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
 - '%cr': committer date, relative
 - '%ct': committer date, UNIX timestamp
 - '%ci': committer date, ISO 8601 format
+- '%d': ref names, like the --decorate option of linkgit:git-log[1]
 - '%e': encoding
 - '%s': subject
 - '%b': body