Merge branch 'nd/clone-no-separate-git-dir-with-bare'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 08a185db7fb7192b4e94c83ae6781893e119c6cf..22c0d6e4b1074b71468ac1c9b16d7eeb0434e225 100644 (file)
--- 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