summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 11:27:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 11:27:28 -0800
commitadb86762e5535108a9fb4ddc63d2e70cee2038a7 (patch)
tree1c2a59dba4cc71e18e1175f60f8299bb3169dbf5 /Documentation
parentMerge branch 'jk/follow-rename-score' (diff)
parentpretty: give placeholders to reflog identity (diff)
downloadtgif-adb86762e5535108a9fb4ddc63d2e70cee2038a7.tar.xz
Merge branch 'jk/pretty-reglog-ent'
* jk/pretty-reglog-ent: pretty: give placeholders to reflog identity
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-formats.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 561cc9f7d7..880b6f2e6f 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -132,6 +132,10 @@ The placeholders are:
- '%N': commit notes
- '%gD': reflog selector, e.g., `refs/stash@\{1\}`
- '%gd': shortened reflog selector, e.g., `stash@\{1\}`
+- '%gn': reflog identity name
+- '%gN': reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
+- '%ge': reflog identity email
+- '%gE': reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
- '%gs': reflog subject
- '%Cred': switch color to red
- '%Cgreen': switch color to green