git-rebase.txt: update note about directory rename detection and am
In commit 6aba117d5cf7 ("am: avoid directory rename detection when calling recursive merge machinery", 2018-08-29), the git-rebase manpage probably should have also been updated to note the stronger incompatibility between git-am and directory rename detection. Update it now. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Dec 7, 2018 at 18:51 UTC
a8f5a59067073a8e5d4949e288a1bc8757109065
1 file changed
+3
-2
Documentation/git-rebase.txt
+3
-2
@@ -570,8 +570,9 @@ it to keep commits that started empty.
570
Directory rename detection
571
~~~~~~~~~~~~~~~~~~~~~~~~~~
572
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.
576
577
include::merge-strategies.txt[]
578