summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-26 14:13:10 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-26 14:13:10 -0800
commit76df4f76799400e688028a29f01197b675545f84 (patch)
tree7c3757358cae00870963af7d540f83ea3d39b8c6 /git-pull.html
parent3fcdd0774d9c54ba3fd7344eed95570cd2e5f329 (diff)
downloadgit-htmldocs-76df4f76799400e688028a29f01197b675545f84.tar.gz
Autogenerated HTML docs for v2.8.0-rc0
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html22
1 files changed, 20 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html
index e67343ba8..65f175386 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1668,12 +1668,30 @@ no-renormalize
</p>
</dd>
<dt class="hdlist1">
+no-renames
+</dt>
+<dd>
+<p>
+ Turn off rename detection.
+ See also <a href="git-diff.html">git-diff(1)</a> <code>--no-renames</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+find-renames[=&lt;n&gt;]
+</dt>
+<dd>
+<p>
+ Turn on rename detection, optionally setting the similarity
+ threshold. This is the default.
+ See also <a href="git-diff.html">git-diff(1)</a> <code>--find-renames</code>.
+</p>
+</dd>
+<dt class="hdlist1">
rename-threshold=&lt;n&gt;
</dt>
<dd>
<p>
- Controls the similarity threshold used for rename detection.
- See also <a href="git-diff.html">git-diff(1)</a> <code>-M</code>.
+ Deprecated synonym for <code>find-renames=&lt;n&gt;</code>.
</p>
</dd>
<dt class="hdlist1">