diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-26 14:13:10 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 14:13:10 -0800 |
commit | 76df4f76799400e688028a29f01197b675545f84 (patch) | |
tree | 7c3757358cae00870963af7d540f83ea3d39b8c6 /git-merge.html | |
parent | 3fcdd0774d9c54ba3fd7344eed95570cd2e5f329 (diff) | |
download | git-htmldocs-76df4f76799400e688028a29f01197b675545f84.tar.gz |
Autogenerated HTML docs for v2.8.0-rc0
Diffstat (limited to 'git-merge.html')
-rw-r--r-- | git-merge.html | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index 80b48724f..e17ce7378 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1485,12 +1485,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[=<n>]
+</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=<n>
</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=<n></code>.
</p>
</dd>
<dt class="hdlist1">
|