summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-27 04:54:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-27 04:54:04 (GMT)
commit329351feeb0c08c835ac4ff05f127fbfe42a78cf (patch)
tree9c6d18cb13544077b05783defd525c7440d7bc68 /Documentation/merge-strategies.txt
parent9b1054d93e7e8564d0d9865cb7118cb6e756c74b (diff)
parent37ab5156ae31ec81e3489406f23be6936a2a370c (diff)
downloadgit-329351feeb0c08c835ac4ff05f127fbfe42a78cf.zip
git-329351feeb0c08c835ac4ff05f127fbfe42a78cf.tar.gz
git-329351feeb0c08c835ac4ff05f127fbfe42a78cf.tar.bz2
Merge branch 'kb/merge-recursive-rename-threshold'
* kb/merge-recursive-rename-threshold: diff: add synonyms for -M, -C, -B merge-recursive: option to specify rename threshold Conflicts: Documentation/diff-options.txt Documentation/merge-strategies.txt
Diffstat (limited to 'Documentation/merge-strategies.txt')
-rw-r--r--Documentation/merge-strategies.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 9cf88e2..595a3cf 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -74,6 +74,10 @@ no-renormalize;;
Disables the `renormalize` option. This overrides the
`merge.renormalize` configuration variable.
+rename-threshold=<n>;;
+ Controls the similarity threshold used for rename detection.
+ See also linkgit:git-diff[1] `-M`.
+
subtree[=<path>];;
This option is a more advanced form of 'subtree' strategy, where
the strategy makes a guess on how two trees must be shifted to