summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-04-19 10:58:04 -0700
committerJunio C Hamano <gitster@pobox.com>2018-04-20 10:44:16 +0900
commitffc16c490ad533bc07e6d8ec0226b426166e8442 (patch)
tree5cb16c0aa62769511fccd0bbb3608266d94d94ec /notes-merge.c
parente5257b2a0d72010cea8150a520347a206394efd0 (diff)
downloadgit-ffc16c490ad533bc07e6d8ec0226b426166e8442.tar.gz
merge-recursive: make a helper function for cleanup for handle_renames
In anticipation of more involved cleanup to come, make a helper function for doing the cleanup at the end of handle_renames. Rename the already existing cleanup_rename[s]() to final_cleanup_rename[s](), name the new helper initial_cleanup_rename(), and leave the big comment in the code about why we can't do all the cleanup at once. 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 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions