Merge branch 'kb/merge-recursive-rename-threshold'

[thirdparty/git.git] / Documentation / merge-strategies.txt

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 77f26061d66fa24c57e169e75cff542e1223e12e..595a3cf1a7118ba29a1d57d7fc17d233d89cd3d0 100644 (file)
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -78,7 +78,7 @@ rename-threshold=<n>;;
        Controls the similarity threshold used for rename detection.
        See also linkgit:git-diff[1] `-M`.
 
-subtree[=path];;
+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
        match with each other when merging.  Instead, the specified path