Re: [PATCH] rebase -i: remember merge options beyond continue actions

2015-12-11 Thread Junio C Hamano
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, the "do_merge" guard to check for a given >

[PATCH] rebase -i: remember merge options beyond continue actions

2015-12-11 Thread Ralf Thielow
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, the "do_merge" guard to check for a given merge strategy or strategy options is implied by passing these optio

Re: [PATCH] rebase -i: Remember merge options beyond continue actions

2014-07-18 Thread Ralf Thielow
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

Re: [PATCH] rebase -i: Remember merge options beyond continue actions

2014-06-11 Thread Michael Haggerty
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

Re: [PATCH] rebase -i: Remember merge options beyond continue actions

2014-06-09 Thread Fabian Ruch
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"

Re: [PATCH] rebase -i: Remember merge options beyond continue actions

2014-06-09 Thread Eric Sunshine
On Mon, Jun 9, 2014 at 8:02 PM, Fabian Ruch 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 2013-08-09 [1].

[PATCH] rebase -i: Remember merge options beyond continue actions

2014-06-09 Thread Fabian Ruch
If the user explicitly specified a merge strategy or strategy options, "rebase --interactive" started using the default merge strategy again after "rebase --continue". This problem gets fixed by this commit. Add test. Since the "rebase" options "-s" and "-X" imply "--merge", we can simply remove