summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-12 09:16:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-12 09:16:56 -0700
commitf4fd6276619dfe7cf9a024730ca65b1bd0b3492b (patch)
treeaa54c677b20d12cbca00ee7d606b0e0184206a24 /mergetools/diffmerge
parentYet another batch for 2.9.3 (diff)
parentam: reset cached ident date for each patch (diff)
downloadtgif-f4fd6276619dfe7cf9a024730ca65b1bd0b3492b.tar.xz
Merge branch 'jk/reset-ident-time-per-commit' into maint
Not-so-recent rewrite of "git am" that started making internal calls into the commit machinery had an unintended regression, in that no matter how many seconds it took to apply many patches, the resulting committer timestamp for the resulting commits were all the same. * jk/reset-ident-time-per-commit: am: reset cached ident date for each patch
Diffstat (limited to 'mergetools/diffmerge')
0 files changed, 0 insertions, 0 deletions