| commit | 6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b | |
| author | Ben Peart <Ben.Peart@microsoft.com> | |
| Wed, 2 May 2018 16:01:16 +0000 (2 16:01 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 May 2018 07:19:41 +0000 (8 16:19 +0900) | ||
| tree | 5cb72e35306adadac40d3dabfdb7fdc18d54fba1 | treesnapshot (tar.gz zip) |
| parent | 85b460305ce7ed399c83499851f46c4f870ce280 | commitdiff |
merge: pass aggressive when rename detection is turned off
Set aggressive flag in git_merge_trees() when rename detection is turned off.
This allows read_tree() to auto resolve more cases that would have otherwise
been handled by the rename detection.
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Ben Peart <benpeart@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Set aggressive flag in git_merge_trees() when rename detection is turned off.
This allows read_tree() to auto resolve more cases that would have otherwise
been handled by the rename detection.
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Ben Peart <benpeart@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |