diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:32 -0800 |
| commit | 9a01f165d44a310f5f46019d822d95adf65f6277 (patch) | |
| tree | 5abb939d62c3bfa63a0fa036d633251f9aa37b41 | |
| parent | Merge branch 'bw/mailmap' (diff) | |
| parent | git-rebase.txt: update note about directory rename detection and am (diff) | |
| download | tgif-9a01f165d44a310f5f46019d822d95adf65f6277.tar.xz | |
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.txt | 5 |
1 files changed, 3 insertions, 2 deletions
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[] |