summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Ariadne Conill <ariadne@dereferenced.org>2019-07-15 07:41:05 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-15 11:44:26 -0700
commit2d9c56905804baa76069e2176035aebd62ddff15 (patch)
treec0f7671d9056792b1cd97efcf26b58ac2b421f44 /resolve-undo.c
parentlog: add warning for unspecified log.mailmap setting (diff)
downloadtgif-2d9c56905804baa76069e2176035aebd62ddff15.tar.xz
documentation: mention --no-use-mailmap and log.mailmap false setting
The log.mailmap setting may be explicitly set to false, which disables the mailmap feature implicity. In practice, doing so is equivalent to always using the previously undocumented --no-use-mailmap option on the command line. Accordingly, we document both the existence of --no-use-mailmap as well as briefly discuss the equivalence of it to log.mailmap=False. Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions