summaryrefslogtreecommitdiffstats
path: root/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-20 18:01:53 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-20 18:01:53 -0800
commitce836cc2c88ad3e08aa7d9cc87292f40fa0d2258 (patch)
tree92643ccc751006cbdf2c9aa19aaa7ecd15a22a67 /git-log.txt
parent5dd5faeb69b77fe53fdaee9e9a6480cfde24052a (diff)
downloadgit-htmldocs-ce836cc2c88ad3e08aa7d9cc87292f40fa0d2258.tar.gz
Autogenerated HTML docs for v1.8.1.1-293-gfe737
Diffstat (limited to 'git-log.txt')
-rw-r--r--git-log.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-log.txt b/git-log.txt
index 08a185db7..22c0d6e4b 100644
--- a/git-log.txt
+++ b/git-log.txt
@@ -47,6 +47,11 @@ OPTIONS
Print out the ref name given on the command line by which each
commit was reached.
+--use-mailmap::
+ Use mailmap file to map author and committer names and email
+ to canonical real names and email addresses. See
+ linkgit:git-shortlog[1].
+
--full-diff::
Without this flag, "git log -p <path>..." shows commits that
touch the specified paths, and diffs about the same specified