diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 23:59:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 23:59:22 +0300 |
| commit | c7cf2de8fcec29e1f834ca75a8468f91a0a37637 (patch) | |
| tree | 48c58e85cef3f6f10345db9ff6f139d3adb607ef /Documentation | |
| parent | f87ee7fd47b180544b755c6e772edf74989bfabb (diff) | |
| parent | ef60740e9efb364d8bb0fba120adecf860cc8ed0 (diff) | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/log.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-log.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 78d9e4453a..7798e10cb0 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -40,4 +40,5 @@ log.showSignature:: log.mailmap:: If true, makes linkgit:git-log[1], linkgit:git-show[1], and - linkgit:git-whatchanged[1] assume `--use-mailmap`. + linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise + assume `--no-use-mailmap`. False by default. diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index b02e922dc3..b406bc4c48 100644 --- 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]. |