Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

Hi Elijah, On Wed, 14 Nov 2018, Elijah Newren wrote: > On Mon, Nov 12, 2018 at 8:21 AM Johannes Schindelin > wrote: > > > t3425: topology linearization was inconsistent across flavors of rebase, > > > as already noted in a TODO comment in the testcase. This was not > > >

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

Hi Phillip, On Mon, Nov 12, 2018 at 10:21 AM Phillip Wood wrote: > >> -Flags only understood by the am backend: > >> +The following options: > >> > >> * --committer-date-is-author-date > >> * --ignore-date > >> @@ -520,15 +512,12 @@ Flags only understood by the am backend: > >> *

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

Hi Dscho, On Mon, Nov 12, 2018 at 8:21 AM Johannes Schindelin wrote: > > t3425: topology linearization was inconsistent across flavors of rebase, > > as already noted in a TODO comment in the testcase. This was not > > considered a bug before, so getting a different

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

Hi Dscho, Thanks for the detailed review! I'll try to get back to all your comments, but for now I feel bad that I didn't see and respond to at least one sooner... On Mon, Nov 12, 2018 at 8:21 AM Johannes Schindelin wrote: > > Thank you for this pleasant read. I think there is still quite a

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

Hi Phillip, On Mon, 12 Nov 2018, Phillip Wood wrote: > It's good to see these patches progressing, I've just got a couple of > comments related to Johannes' points below > > On 12/11/2018 16:21, Johannes Schindelin wrote: > > Hi Elijah, > > > > On Wed, 7 Nov 2018, Elijah Newren wrote: > > >

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

Hi Elijah It's good to see these patches progressing, I've just got a couple of comments related to Johannes' points below On 12/11/2018 16:21, Johannes Schindelin wrote: > Hi Elijah, > > On Wed, 7 Nov 2018, Elijah Newren wrote: > >> Interactive rebases are implemented in terms of cherry-pick

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

Hi Elijah, On Wed, 7 Nov 2018, Elijah Newren wrote: > Interactive rebases are implemented in terms of cherry-pick rather than > the merge-recursive builtin, but cherry-pick also calls into the recursive > merge machinery by default and can accept special merge strategies and/or > special

[PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

Interactive rebases are implemented in terms of cherry-pick rather than the merge-recursive builtin, but cherry-pick also calls into the recursive merge machinery by default and can accept special merge strategies and/or special strategy options. As such, there really is not any need for having