diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:00 -0700 |
commit | 9404128b34bc1abfc99b20f2ce4ca14a2828d7a0 (patch) | |
tree | 6f6430eaf5a65447df4090b9b972c02eab49c138 /Documentation | |
parent | Merge branch 'ma/doc-discard-docbook-xsl-1.73' (diff) | |
parent | log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap (diff) | |
download | tgif-9404128b34bc1abfc99b20f2ce4ca14a2828d7a0.tar.xz |
Merge branch 'jc/log-no-mailmap'
"git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"
* jc/log-no-mailmap:
log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap
clone: reorder --recursive/--recurse-submodules
parse-options: teach "git cmd -h" to show alias as alias
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-log.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index bed09bb09e..619577f23b 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -49,6 +49,7 @@ OPTIONS Print out the ref name given on the command line by which each commit was reached. +--[no-]mailmap:: --[no-]use-mailmap:: Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See |