diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 05:04:04 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 05:04:04 (GMT) |
commit | 6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e (patch) | |
tree | 11ca48aef79f68e740aa7a97c4956327d58114cb /Documentation/merge-config.txt | |
parent | c5aa4bccb5ffcc01e45915c00d2fce30ce959dab (diff) | |
parent | 6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b (diff) | |
download | git-6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e.zip git-6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e.tar.gz git-6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e.tar.bz2 |
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
Diffstat (limited to 'Documentation/merge-config.txt')
-rw-r--r-- | Documentation/merge-config.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 12b6bbf..662c271 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -35,7 +35,13 @@ include::fmt-merge-msg-config.txt[] merge.renameLimit:: The number of files to consider when performing rename detection during a merge; if not specified, defaults to the value of - diff.renameLimit. + diff.renameLimit. This setting has no effect if rename detection + is turned off. + +merge.renames:: + Whether and how Git detects renames. If set to "false", + rename detection is disabled. If set to "true", basic rename + detection is enabled. Defaults to the value of diff.renames. merge.renormalize:: Tell Git that canonical representation of files in the |