diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-26 21:37:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 21:37:25 (GMT) |
| commit | 4ce064dd813279109a4003dee8c8b63077ab473d (patch) | |
| tree | c9ee63074543b9a0a6a116756c0d0b5d6f5c1847 /sha1-lookup.h | |
| parent | 9671a76c174d9bd2b4f56243526fda51f9ff8e46 (diff) | |
| parent | 44c74ecade186d7c7047642840d581709db3ba23 (diff) | |
| download | git-4ce064dd813279109a4003dee8c8b63077ab473d.zip git-4ce064dd813279109a4003dee8c8b63077ab473d.tar.gz git-4ce064dd813279109a4003dee8c8b63077ab473d.tar.bz2 | |
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 'sha1-lookup.h')
0 files changed, 0 insertions, 0 deletions