summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-11-09 03:31:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-12 12:52:23 +0900
commita35b13fce00bf5644d1ab71f9779466be1c7aa67 (patch)
tree2fa0ee0174e334aebaff6f7a77b079087e5b86a2 /mergetools/p4merge
parentNinth batch for 2.20 (diff)
downloadtgif-a35b13fce00bf5644d1ab71f9779466be1c7aa67.tar.xz
Update .mailmap
This patch makes the output of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing the current and preferred addresses for authors that appear with more than one address. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions