]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-rebase.txt: update note about directory rename detection and am
authorElijah Newren <newren@gmail.com>
Fri, 7 Dec 2018 17:51:20 +0000 (18:51 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Dec 2018 00:21:23 +0000 (09:21 +0900)
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>
Documentation/git-rebase.txt

index dff17b31788fec085b91314b3b3328c689050628..8285a388decbfceb342f9b996095f794d1ba90d1 100644 (file)
@@ -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[]