| commit | 6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 May 2018 05:04:04 +0000 (30 14:04 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 May 2018 05:04:04 +0000 (30 14:04 +0900) | ||
| tree | 11ca48aef79f68e740aa7a97c4956327d58114cb | treesnapshot (tar.gz zip) |
| parent | c5aa4bccb5ffcc01e45915c00d2fce30ce959dab | commitdiff |
| parent | 6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b | commitdiff |
Merge branch 'bp/merge-rename-config'
With merge.renames configuration set to false, the recursive merge
strategy can be told not to spend cycles trying to find renamed
paths and merge them accordingly.
* bp/merge-rename-config:
merge: pass aggressive when rename detection is turned off
merge: add merge.renames config setting
merge: update documentation for {merge,diff}.renameLimit
With merge.renames configuration set to false, the recursive merge
strategy can be told not to spend cycles trying to find renamed
paths and merge them accordingly.
* bp/merge-rename-config:
merge: pass aggressive when rename detection is turned off
merge: add merge.renames config setting
merge: update documentation for {merge,diff}.renameLimit
| diff.c | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |