summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorAntoine Pelisse <apelisse@gmail.com>2013-01-05 22:26:43 +0100
committerJunio C Hamano <gitster@pobox.com>2013-01-10 12:33:08 -0800
commitea57bc0d41b03cc1528be5fafa5eb8bfd4f773cb (patch)
tree9c0af6c0fe9d4f0b8c3aebcb3000a8dbeda57a77 /Documentation/git-log.txt
parentdffd325f379b825ca449e1592fa9fb31eddf1780 (diff)
downloadgit-ea57bc0d41b03cc1528be5fafa5eb8bfd4f773cb.tar.gz
log: add --use-mailmap option
Add the --use-mailmap option to log commands. It allows to display names from mailmap file when displaying logs, whatever the format used. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 585dac40ba..a99be97335 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/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