diff options
| author |  Felipe Gonçalves Assis <felipeg.assis@gmail.com> | 2016-02-17 01:15:26 -0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:20:52 -0800 |
| commit | 1b47ad160b55f50a7a98c180e18d80f0f8f17a67 (patch) | |
| tree | 196dcd66914dca5b4a8329a7d54b599680a7074c /test-sha1.c | |
| parent | merge-recursive: option to disable renames (diff) | |
| download | tgif-1b47ad160b55f50a7a98c180e18d80f0f8f17a67.tar.xz | |
merge-recursive: more consistent interface
Add strategy option find-renames, following git-diff interface. This
makes the option rename-threshold redundant.
Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'test-sha1.c')
0 files changed, 0 insertions, 0 deletions