From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Aug 2019 20:12:02 +0000 (-0700)
Subject: Merge branch 'jc/log-mailmap-flip-defaults'
X-Git-Tag: v2.23.0-rc1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9b274e28871b3e4a4109582a34625df5fddc91c8?ds=inline;hp=-c

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
---

9b274e28871b3e4a4109582a34625df5fddc91c8
diff --combined Documentation/RelNotes/2.23.0.txt
index e1b1ce5680,6ef8f21b56..65c8c0e58c
--- a/Documentation/RelNotes/2.23.0.txt
+++ b/Documentation/RelNotes/2.23.0.txt
@@@ -10,6 -10,9 +10,9 @@@ Backward compatibility not
     prerequisite patches in an unstable way, which has been updated to
     compute in a way that is compatible with "git patch-id --stable".
  
+  * The "git log" command by default behaves as if the --mailmap option
+    was given.
+ 
  
  UI, Workflows & Features
  
@@@ -52,7 -55,7 +55,7 @@@
  
   * "git fetch" and "git pull" reports when a fetch results in
     non-fast-forward updates to let the user notice unusual situation.
 -   The commands learned "--no-shown-forced-updates" option to disable
 +   The commands learned "--no-show-forced-updates" option to disable
     this safety feature.
  
   * Two new commands "git switch" and "git restore" are introduced to
@@@ -68,7 -71,7 +71,7 @@@
   * The conditional inclusion mechanism learned to base the choice on
     the branch the HEAD currently is on.
  
 - * "git rev-list --objects" learned with "--no-object-names" option to
 + * "git rev-list --objects" learned the "--no-object-names" option to
     squelch the path to the object that is used as a grouping hint for
     pack-objects.
  
@@@ -91,11 -94,6 +94,6 @@@
     commit-graph files now, which allows the commit-graph files to be
     updated incrementally.
  
-  * 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.
- 
   * "git range-diff" output has been tweaked for easier identification
     of which part of what file the patch shown is about.
  
@@@ -106,7 -104,7 +104,7 @@@ Performance, Internal Implementation, D
     no longer be used.
  
   * Developer support to emulate unsatisfied prerequisites in tests to
 -   ensure that the remainer of the tests still succeeds when tests
 +   ensure that the remainder of the tests still succeeds when tests
     with prerequisites are skipped.
  
   * "git update-server-info" learned not to rewrite the file with the
@@@ -121,7 -119,7 +119,7 @@@
   * Prepare use of reachability index in topological walker that works
     on a range (A..B).
  
 - * A new tutorial targetting specifically aspiring git-core
 + * A new tutorial targeting specifically aspiring git-core
     developers has been added.
  
   * Auto-detect how to tell HP-UX aCC where to use dynamically linked
@@@ -181,7 -179,7 +179,7 @@@ Fixes since v2.2
     the same repository was corrupt, which has been corrected.
  
   * The ownership rule for the file descriptor to fast-import remote
 -   backend was mixed up, leading to unrelated file descriptor getting
 +   backend was mixed up, leading to an unrelated file descriptor getting
     closed, which has been fixed.
  
   * A "merge -c" instruction during "git rebase --rebase-merges" should
@@@ -306,7 -304,7 +304,7 @@@
  
   * The configuration variable rebase.rescheduleFailedExec should be
     effective only while running an interactive rebase and should not
 -   affect anything when running an non-interactive one, which was not
 +   affect anything when running a non-interactive one, which was not
     the case.  This has been corrected.
  
   * The "git clone" documentation refers to command line options in its
@@@ -339,7 -337,7 +337,7 @@@
     having to consult the other end, which has been corrected.
  
   * The internal diff machinery can be made to read out of bounds while
 -   looking for --funcion-context line in a corner case, which has been
 +   looking for --function-context line in a corner case, which has been
     corrected.
     (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).