On Fri, Dec 11, 2015 at 11:54 AM, Ralf Thielow wrote:
> From: Fabian Ruch
>
> If the user specifies a merge strategy or strategy options in
> "rebase --interactive", also use these in subsequent calls of
> "rebase --continue".
>
> In the implementation,
Hi,
Thanks for the patch. I've had this issue today
and the patch has fixed it. I hope the patch makes
its way to Git.
Ralf
Hi Eric,
thanks a lot for the reference.
I added the Reported-by: and Signed-off-by: lines to the commit message.
Fabian
-- 8 --
Subject: rebase -i:
The fix seems reasonable to me. See below for a couple of suggestions
regarding the commit message.
On 06/10/2014 02:37 AM, Fabian Ruch wrote:
[...]
-- 8 --
Subject: rebase -i: Remember merge options beyond continue actions
If the user explicitly specified a merge strategy or strategy
On Mon, Jun 9, 2014 at 8:02 PM, Fabian Ruch baf...@gmail.com wrote:
If the user explicitly specified a merge strategy or strategy options,
rebase --interactive started using the default merge strategy again
after rebase --continue.
For reference, this problem was reported as far back as
Hi Eric,
thanks a lot for the reference.
I added the Reported-by: and Signed-off-by: lines to the commit message.
Fabian
-- 8 --
Subject: rebase -i: Remember merge options beyond continue actions
If the user explicitly specified a merge strategy or strategy options,
rebase --interactive
5 matches
Mail list logo