Re: [PATCH] git-rebase.txt: update note about directory rename detection and am

2018-12-08 Thread Junio C Hamano
Elijah Newren writes: > On Fri, Dec 7, 2018 at 9:51 AM Johannes Sixt wrote: >> >> From: Elijah Newren >> >> 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

Re: [PATCH] git-rebase.txt: update note about directory rename detection and am

2018-12-07 Thread Elijah Newren
On Fri, Dec 7, 2018 at 9:51 AM Johannes Sixt wrote: > > From: Elijah Newren > > 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 > incompatibil

[PATCH] git-rebase.txt: update note about directory rename detection and am

2018-12-07 Thread Johannes Sixt
From: Elijah Newren 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