diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-12-07 18:51:20 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-12-09 09:21:23 +0900 |
| commit | a8f5a59067073a8e5d4949e288a1bc8757109065 (patch) | |
| tree | ff958a9a212d6055bf4079508de70e22bd04bf8e | |
| parent | Merge branch 'es/format-patch-range-diff-fix-fix' (diff) | |
| download | tgif-a8f5a59067073a8e5d4949e288a1bc8757109065.tar.xz | |
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 <newren@gmail.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 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[] |