On Tue, Dec 4, 2018 at 1:53 PM Johannes Sixt <[email protected]> wrote:
>
> Am 04.12.18 um 22:24 schrieb Elijah Newren:
> > +.... The am backend sometimes does not because it operates on
> > +"fake ancestors" that involve trees containing only the files modified
> > +in the patch. Without accurate tree information, directory rename
> > +detection cannot safely operate and is thus turned off in the am
> > +backend.
>
> Directory rename detection does not work sometimes. That is, it works
> most of the time. But how can that be the case when it is turned off?
Gah, when I was rebasing on your patch I adopted your sentence rewrite
but forgot to remove the "sometimes". Thanks for catching; correction:
-- 8< --
Subject: [PATCH v2] 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 <[email protected]>
---
Documentation/git-rebase.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 41631df6e4..ef76cccf3f 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -569,8 +569,12 @@ 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.
+The merge and interactive backends work fine with directory rename
+detection. The am backend does not because it operates on "fake
+ancestors" that involve trees containing only the files modified in
+the patch. Without accurate tree information, directory rename
+detection cannot safely operate and is thus turned off in the am
+backend.
include::merge-strategies.txt[]
--
2.20.0.rc1.2.gca0e531e87
