From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jul 2019 20:59:22 +0000 (-0700)
Subject: Merge branch 'ac/log-use-mailmap-by-default-transition'
X-Git-Tag: v2.23.0-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7cf2de8fcec29e1f834ca75a8468f91a0a37637;p=thirdparty%2Fgit.git

Merge branch 'ac/log-use-mailmap-by-default-transition'

The "git log" command learns to issue a warning when log.mailmap
configuration is not set and --[no-]mailmap option is not used, to
prepare users for future versions of Git that uses the mailmap by
default.

* ac/log-use-mailmap-by-default-transition:
  tests: defang pager tests by explicitly disabling the log.mailmap warning
  documentation: mention --no-use-mailmap and log.mailmap false setting
  log: add warning for unspecified log.mailmap setting
---

c7cf2de8fcec29e1f834ca75a8468f91a0a37637