| commit | b520abf1c8f3dcbd218c9ae26830b7e2c94866c7 | |
| author | Elijah Newren <newren@gmail.com> | |
| Mon, 13 Nov 2017 20:15:57 +0000 (13 12:15 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Nov 2017 02:37:24 +0000 (14 11:37 +0900) | ||
| tree | 55ec05cc6a0fdb2e803433ee8445ea89b12dbd69 | treesnapshot (tar.gz zip) |
| parent | d8df70f2739af78cab6d7f9b942e890da6fbd01d | commitdiff |
sequencer: warn when internal merge may be suboptimal due to renameLimit
When many files were renamed, the recursive merge strategy stopped
detecting renames and left many paths with delete/modify conflicts,
without any warning about what was going on or providing any hints about
how to tell Git to spend more cycles to detect renames.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When many files were renamed, the recursive merge strategy stopped
detecting renames and left many paths with delete/modify conflicts,
without any warning about what was going on or providing any hints about
how to tell Git to spend more cycles to detect renames.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory |