Skip to content

Commit 9a01f16

Browse files
committed
Merge branch 'en/directory-renames-nothanks-doc-update'
Doc update. * en/directory-renames-nothanks-doc-update: git-rebase.txt: update note about directory rename detection and am
2 parents d076ad1 + a8f5a59 commit 9a01f16

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Documentation/git-rebase.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,9 @@ it to keep commits that started empty.
570570
Directory rename detection
571571
~~~~~~~~~~~~~~~~~~~~~~~~~~
572572

573-
The merge and interactive backends work fine with
574-
directory rename detection. The am backend sometimes does not.
573+
Directory rename heuristics are enabled in the merge and interactive
574+
backends. Due to the lack of accurate tree information, directory
575+
rename detection is disabled in the am backend.
575576

576577
include::merge-strategies.txt[]
577578

0 commit comments

Comments
 (0)