diff options
| author |  Ben Peart <Ben.Peart@microsoft.com> | 2018-05-02 16:01:16 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:19:41 +0900 |
| commit | 6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b (patch) | |
| tree | 5cb72e35306adadac40d3dabfdb7fdc18d54fba1 /t/t5614-clone-submodules-shallow.sh | |
| parent | merge: add merge.renames config setting (diff) | |
| download | tgif-6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b.tar.xz | |
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 't/t5614-clone-submodules-shallow.sh')
0 files changed, 0 insertions, 0 deletions