diff options
| author | Elijah Newren <newren@gmail.com> | 2017-11-13 20:15:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-14 02:37:24 (GMT) |
| commit | b520abf1c8f3dcbd218c9ae26830b7e2c94866c7 (patch) | |
| tree | 55ec05cc6a0fdb2e803433ee8445ea89b12dbd69 /progress.c | |
| parent | d8df70f2739af78cab6d7f9b942e890da6fbd01d (diff) | |
| download | git-b520abf1c8f3dcbd218c9ae26830b7e2c94866c7.zip git-b520abf1c8f3dcbd218c9ae26830b7e2c94866c7.tar.gz git-b520abf1c8f3dcbd218c9ae26830b7e2c94866c7.tar.bz2 | |
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>
Diffstat (limited to 'progress.c')
0 files changed, 0 insertions, 0 deletions