From: Elijah Newren Date: Fri, 7 Dec 2018 17:51:20 +0000 (+0100) Subject: git-rebase.txt: update note about directory rename detection and am X-Git-Tag: v2.21.0-rc0~107^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a8f5a59067073a8e5d4949e288a1bc8757109065?ds=inline;hp=--cc 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 Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- a8f5a59067073a8e5d4949e288a1bc8757109065 diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index dff17b3178..8285a388de 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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[]