summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-04-19 10:58:12 -0700
committerJunio C Hamano <gitster@pobox.com>2018-05-08 16:11:00 +0900
commit64b1abe962b44e6bad84b980e8ea2811302e71c7 (patch)
tree9ad6dc0daca8ad87bd6612e82feaf6fb1fe379e1 /commit.c
parent79c47598f5c8c0008ae9281f20c2a041d4cabd93 (diff)
merge-recursive: fix overwriting dirty files involved in renames
This fixes an issue that existed before my directory rename detection patches that affects both normal renames and renames implied by directory rename detection. Additional codepaths that only affect overwriting of dirty files that are involved in directory rename detection will be added in a subsequent commit. Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions