Merge branch 'js/visual-studio'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index b02e922dc33d248493df4bf6e1bb42f342e38daa..b406bc4c48f4230c6a211374556d33a3b18081e7 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -49,7 +49,7 @@ OPTIONS
        Print out the ref name given on the command line by which each
        commit was reached.
 
---use-mailmap::
+--[no-]use-mailmap::
        Use mailmap file to map author and committer names and email
        addresses to canonical real names and email addresses. See
        linkgit:git-shortlog[1].