| commit | 473b8bb3aa01fb214c9905456f1f33c9c7def6b3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jul 2018 19:20:27 +0000 (18 12:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jul 2018 19:20:27 +0000 (18 12:20 -0700) | ||
| tree | e5116c1a7fca8c9dbd7b9616ca9b84881520c522 | treesnapshot (tar.gz zip) |
| parent | e3331758f12da22f4103eec7efe1b5304a9be5e9 | commitdiff |
| parent | 5b26c3c941d3c7cd96be668e1778ba22cc4829d5 | commitdiff |
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
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
| merge-recursive.c | diff1 | diff2 | blobhistory |