Re: [PATCH v7 06/17] sequencer: introduce new commands to reset the revision

2018-04-20 Thread Johannes Schindelin
Hi Phillip, On Fri, 20 Apr 2018, Phillip Wood wrote: > On 19/04/18 13:20, Johannes Schindelin wrote: > > [... please cull long stretches of quoted mail that is not responded to ...] > > > @@ -2665,6 +2846,12 @@ static int pick_commits(struct todo_list *todo_list, > > struct replay_opts *opts) >

Re: [PATCH v7 06/17] sequencer: introduce new commands to reset the revision

2018-04-20 Thread Phillip Wood
On 19/04/18 13:20, Johannes Schindelin wrote: > In the upcoming commits, we will teach the sequencer to rebase merges. > This will be done in a very different way from the unfortunate design of > `git rebase --preserve-merges` (which does not allow for reordering > commits, or changing the branch

[PATCH v7 06/17] sequencer: introduce new commands to reset the revision

2018-04-19 Thread Johannes Schindelin
In the upcoming commits, we will teach the sequencer to rebase merges. This will be done in a very different way from the unfortunate design of `git rebase --preserve-merges` (which does not allow for reordering commits, or changing the branch topology). The main idea is to introduce new todo