summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-08-02 13:12:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-02 13:12:02 -0700
commit9b274e28871b3e4a4109582a34625df5fddc91c8 (patch)
treec921299d1381a3bd6486ef999e3cc432118d1d72 /Documentation/config
parentMerge branch 'js/early-config-with-onbranch' (diff)
parentlog: really flip the --mailmap default (diff)
downloadtgif-9b274e28871b3e4a4109582a34625df5fddc91c8.tar.xz
Merge branch 'jc/log-mailmap-flip-defaults'
Hotfix for making "git log" use the mailmap by default. * jc/log-mailmap-flip-defaults: log: really flip the --mailmap default log: flip the --mailmap default unconditionally
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/log.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index 7798e10cb0..e9e1e397f3 100644
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -41,4 +41,4 @@ log.showSignature::
log.mailmap::
If true, makes linkgit:git-log[1], linkgit:git-show[1], and
linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise
- assume `--no-use-mailmap`. False by default.
+ assume `--no-use-mailmap`. True by default.