diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:25 -0800 |
| commit | 4ce064dd813279109a4003dee8c8b63077ab473d (patch) | |
| tree | c9ee63074543b9a0a6a116756c0d0b5d6f5c1847 /blob.c | |
| parent | Merge branch 'sb/submodule-fetch-nontip' (diff) | |
| parent | t3034: test deprecated interface (diff) | |
| download | tgif-4ce064dd813279109a4003dee8c8b63077ab473d.tar.xz | |
Merge branch 'fa/merge-recursive-no-rename'
"git merge-recursive" learned "--no-renames" option to disable its
rename detection logic.
* fa/merge-recursive-no-rename:
t3034: test deprecated interface
t3034: test option to disable renames
t3034: add rename threshold tests
merge-recursive: find-renames resets threshold
merge-strategies.txt: fix typo
merge-recursive: more consistent interface
merge-recursive: option to disable renames
Diffstat (limited to 'blob.c')
0 files changed, 0 insertions, 0 deletions