Skip to content

Commit a8f5a59

Browse files
newrengitster
authored andcommitted
git-rebase.txt: update note about directory rename detection and am
In commit 6aba117 ("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]> Signed-off-by: Johannes Sixt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 965798d commit a8f5a59

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Documentation/git-rebase.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,9 @@ it to keep commits that started empty.
570570
Directory rename detection
571571
~~~~~~~~~~~~~~~~~~~~~~~~~~
572572

573-
The merge and interactive backends work fine with
574-
directory rename detection. The am backend sometimes does not.
573+
Directory rename heuristics are enabled in the merge and interactive
574+
backends. Due to the lack of accurate tree information, directory
575+
rename detection is disabled in the am backend.
575576

576577
include::merge-strategies.txt[]
577578

0 commit comments

Comments
 (0)