diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 15:32:59 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 15:32:59 +0900 |
| commit | 309465b1bf49218ee65ee2e621cedf56bcf8b2c1 (patch) | |
| tree | 512b922b36a168f2a776a8b4f1e414056544b72a /git-rebase.html | |
| parent | c567f86bbb472a4a0a93126ecf53ab9b498841db (diff) | |
| download | git-htmldocs-309465b1bf49218ee65ee2e621cedf56bcf8b2c1.tar.gz | |
Autogenerated HTML docs for v2.17.1-904-gf15a4
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/git-rebase.html b/git-rebase.html index fd6da3712..68d96752e 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1529,8 +1529,9 @@ recursive causing mismerges by tests done on actual merge commits
taken from Linux 2.6 kernel development history.
Additionally this can detect and handle merges involving
- renames. This is the default merge strategy when
- pulling or merging one branch.
+ renames, but currently cannot make use of detected
+ copies. This is the default merge strategy when pulling
+ or merging one branch.
</p>
<div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
<div class="dlist"><dl>
@@ -1647,7 +1648,8 @@ no-renames </dt>
<dd>
<p>
- Turn off rename detection.
+ Turn off rename detection. This overrides the <code>merge.renames</code>
+ configuration variable.
See also <a href="git-diff.html">git-diff(1)</a> <code>--no-renames</code>.
</p>
</dd>
@@ -1657,7 +1659,8 @@ find-renames[=<n>] <dd>
<p>
Turn on rename detection, optionally setting the similarity
- threshold. This is the default.
+ threshold. This is the default. This overrides the
+ <em>merge.renames</em> configuration variable.
See also <a href="git-diff.html">git-diff(1)</a> <code>--find-renames</code>.
</p>
</dd>
|