summaryrefslogtreecommitdiff
path: root/bulk-checkin.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-07-18 19:20:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-18 19:20:27 (GMT)
commit473b8bb3aa01fb214c9905456f1f33c9c7def6b3 (patch)
treee5116c1a7fca8c9dbd7b9616ca9b84881520c522 /bulk-checkin.c
parente3331758f12da22f4103eec7efe1b5304a9be5e9 (diff)
parent5b26c3c941d3c7cd96be668e1778ba22cc4829d5 (diff)
downloadgit-473b8bb3aa01fb214c9905456f1f33c9c7def6b3.zip
git-473b8bb3aa01fb214c9905456f1f33c9c7def6b3.tar.gz
git-473b8bb3aa01fb214c9905456f1f33c9c7def6b3.tar.bz2
Merge branch 'en/merge-recursive-cleanup'
Code cleanup. * en/merge-recursive-cleanup: merge-recursive: add pointer about unduly complex looking code merge-recursive: rename conflict_rename_*() family of functions merge-recursive: clarify the rename_dir/RENAME_DIR meaning merge-recursive: align labels with their respective code blocks merge-recursive: fix numerous argument alignment issues merge-recursive: fix miscellaneous grammar error in comment
Diffstat (limited to 'bulk-checkin.c')
0 files changed, 0 insertions, 0 deletions