summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorBen Peart <Ben.Peart@microsoft.com>2018-05-02 16:01:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-08 07:19:41 (GMT)
commit6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b (patch)
tree5cb72e35306adadac40d3dabfdb7fdc18d54fba1 /Documentation
parent85b460305ce7ed399c83499851f46c4f870ce280 (diff)
downloadgit-6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b.zip
git-6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b.tar.gz
git-6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b.tar.bz2
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>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions