Elijah Newren <newren@xxxxxxxxx> writes:
> On Fri, Dec 7, 2018 at 9:51 AM Johannes Sixt <j6t@xxxxxxxx> wrote:
>>
>> From: Elijah Newren <newren@xxxxxxxxx>
>>
>> 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@xxxxxxxxx>
>> Signed-off-by: Johannes Sixt <j6t@xxxxxxxx>
>> ---
>> Documentation/git-rebase.txt | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
>> index 41631df6e4..7bea21e8e3 100644
>> --- a/Documentation/git-rebase.txt
>> +++ b/Documentation/git-rebase.txt
>> @@ -569,8 +569,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[]
>
> I was intending to send this out the past couple days, was just kinda
> busy. Thanks for handling it for me.
Thanks, both. I can live with format=flowed, but would appreciate
if we can avoid it next time.
