diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-18 15:16:05 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-18 15:16:05 -0800 |
commit | ace33e4fa1aa5ba14bafe92218bf07dea068791f (patch) | |
tree | 0ad7636f0f64e4f949fd65f468e206bc0a5d969b /git-rebase.txt | |
parent | de48f457367f37c28229ebe8e6cef849dd6e430a (diff) | |
download | git-htmldocs-ace33e4fa1aa5ba14bafe92218bf07dea068791f.tar.gz |
Autogenerated HTML docs for v2.20.1-309-g16a465
Diffstat (limited to 'git-rebase.txt')
-rw-r--r-- | git-rebase.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index dff17b317..d284155cf 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -570,8 +570,9 @@ it to keep commits that started empty. Directory rename detection ~~~~~~~~~~~~~~~~~~~~~~~~~~ -The merge and interactive backends work fine with -directory rename detection. The am backend sometimes does not. +Directory rename heuristics are enabled in the merge and interactive +backends. Due to the lack of accurate tree information, directory +rename detection is disabled in the am backend. include::merge-strategies.txt[] @@ -979,7 +980,7 @@ when the merge operation did not even start), it is rescheduled immediately. At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, -strategy, with no way to choose a different one. To work around +with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example). |