diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 15:27:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 15:27:03 -0700 |
| commit | 013942f637e2e0706b5a44e58a9d285bc57c5305 (patch) | |
| tree | f9919df4ac540b042a57bb1a5cd16fc139f53517 /Documentation | |
| parent | c9784cd0c8576ccbacb3d7dd14000d0892c3fdf6 (diff) | |
| parent | e0cbc39768884a1e7edcf2dbf6e6825c4b23485a (diff) | |
| download | git-013942f637e2e0706b5a44e58a9d285bc57c5305.tar.gz git-013942f637e2e0706b5a44e58a9d285bc57c5305.tar.xz | |
Merge branch 'js/maint-pretty-mailmap' into maint
* js/maint-pretty-mailmap:
Add pretty format %aN which gives the author name, respecting .mailmap
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pretty-formats.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 69e6d2fa4..c11d49577 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/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 |