| commit | 4ce064dd813279109a4003dee8c8b63077ab473d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 Feb 2016 21:37:25 +0000 (26 13:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 Feb 2016 21:37:25 +0000 (26 13:37 -0800) | ||
| tree | c9ee63074543b9a0a6a116756c0d0b5d6f5c1847 | treesnapshot (tar.gz zip) |
| parent | 9671a76c174d9bd2b4f56243526fda51f9ff8e46 | commitdiff |
| parent | 44c74ecade186d7c7047642840d581709db3ba23 | commitdiff |
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
"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