git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 85b4603)
merge: pass aggressive when rename detection is turned off
authorBen Peart <redacted>
Wed, 2 May 2018 16:01:16 +0000 (16:01 +0000)
committerJunio C Hamano <redacted>
Tue, 8 May 2018 07:19:41 +0000 (16:19 +0900)
commit6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b
tree5cb72e35306adadac40d3dabfdb7fdc18d54fba1tree | snapshot
parent85b460305ce7ed399c83499851f46c4f870ce280commit | diff
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 <redacted>
Signed-off-by: Ben Peart <redacted>
Reviewed-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
git clone https://git.99rst.org/PROJECT