summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:32 (GMT)
commit9a01f165d44a310f5f46019d822d95adf65f6277 (patch)
tree5abb939d62c3bfa63a0fa036d633251f9aa37b41
parentd076ad1330ea79fb1364d2078446f8936627f96c (diff)
parenta8f5a59067073a8e5d4949e288a1bc8757109065 (diff)
downloadgit-9a01f165d44a310f5f46019d822d95adf65f6277.zip
git-9a01f165d44a310f5f46019d822d95adf65f6277.tar.gz
git-9a01f165d44a310f5f46019d822d95adf65f6277.tar.bz2
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
-rw-r--r--Documentation/git-rebase.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 2ee535f..d284155 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[]