diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-02-08 14:34:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-08 20:38:08 (GMT) |
| commit | 7d48e9e6f77d336376c1a554eeff0590f77e1ee1 (patch) | |
| tree | 0b417a815a62150e164ba0b237195ae89153c78b /Documentation/pretty-formats.txt | |
| parent | d20d654fe8923a502527547b17fe284d15d6aec9 (diff) | |
| download | git-7d48e9e6f77d336376c1a554eeff0590f77e1ee1.zip git-7d48e9e6f77d336376c1a554eeff0590f77e1ee1.tar.gz git-7d48e9e6f77d336376c1a554eeff0590f77e1ee1.tar.bz2 | |
Move mailmap documentation into separate file
Include it directly from git-shortlog.txt, and refer
to it from pretty-format.txt.
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/pretty-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 28808b7..159390c 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -101,18 +101,18 @@ The placeholders are: - '%P': parent hashes - '%p': abbreviated parent hashes - '%an': author name -- '%aN': author name (respecting .mailmap) +- '%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1]) - '%ae': author email -- '%aE': author email (respecting .mailmap) +- '%aE': author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1]) - '%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) +- '%cN': committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1]) - '%ce': committer email -- '%cE': committer email (respecting .mailmap) +- '%cE': committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1]) - '%cd': committer date - '%cD': committer date, RFC2822 style - '%cr': committer date, relative |