X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-strategies.txt;fp=Documentation%2Fmerge-strategies.txt;h=595a3cf1a7118ba29a1d57d7fc17d233d89cd3d0;hb=329351feeb0c08c835ac4ff05f127fbfe42a78cf;hp=9cf88e2bb5baa51c334e6d7232f926b49aef3681;hpb=9b1054d93e7e8564d0d9865cb7118cb6e756c74b;p=git.git

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 9cf88e2bb..595a3cf1a 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