From: Junio C Hamano Date: Mon, 14 Jan 2019 23:29:32 +0000 (-0800) Subject: Merge branch 'en/directory-renames-nothanks-doc-update' X-Git-Tag: v2.21.0-rc0~107 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9a01f165d44a310f5f46019d822d95adf65f6277?hp=d076ad1330ea79fb1364d2078446f8936627f96c 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 --- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 2ee535fb23..d284155cf3 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[]