git-branch.txt: mention --set-upstream as a way to change upstream configuration

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 9cf88e2bb5baa51c334e6d7232f926b49aef3681..595a3cf1a7118ba29a1d57d7fc17d233d89cd3d0 100644 (file)
--- 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