]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f08250 abf94a2)
Merge branch 'sa/multi-mailmap-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jun 2025 16:48:51 +0000 (09:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jun 2025 16:48:51 +0000 (09:48 -0700)
commit1e60e1d6d8e769c71547569d127f8149bffcd9ff
tree9e0eff004982d46208142a86755a29da3855a3fbtree | snapshot
parent1f082506ba5b9815a6d7476aca40880c08950fefcommit | diff
parentabf94a283fd85e680f8d720241e6059dbb5f23f5commit | diff
Merge branch 'sa/multi-mailmap-fix'

When asking to apply mailmap to both author and committer field
while showing a commit object, the field that appears later was not
correctly parsed and replaced, which has been corrected.

* sa/multi-mailmap-fix:
  cat-file: fix mailmap application for different author and committer
ident.c diff1 | diff2 | blob | history
t/t4203-mailmap.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.