Re: [PATCH v2 02/10] sequencer: introduce new commands to reset the revision

2018-02-10 Thread Johannes Schindelin
Hi Eric, On Tue, 30 Jan 2018, Eric Sunshine wrote: > On Mon, Jan 29, 2018 at 5:54 PM, Johannes Schindelin > wrote: > > [...] > > This commit implements the commands to label, and to reset to, given > > revisions. The syntax is: > > > > label > >

Re: [PATCH v2 02/10] sequencer: introduce new commands to reset the revision

2018-01-31 Thread Johannes Schindelin
Hi Stefan, On Tue, 30 Jan 2018, Stefan Beller wrote: > On Mon, Jan 29, 2018 at 2:54 PM, Johannes Schindelin > wrote: > > @@ -116,6 +118,13 @@ static GIT_PATH_FUNC(rebase_path_stopped_sha, > > "rebase-merge/stopped-sha") > > static

Re: [PATCH v2 02/10] sequencer: introduce new commands to reset the revision

2018-01-30 Thread Stefan Beller
On Mon, Jan 29, 2018 at 2:54 PM, Johannes Schindelin wrote: > In the upcoming commits, we will teach the sequencer to recreate merges. > This will be done in a very different way from the unfortunate design of > `git rebase --preserve-merges` (which does not allow for

Re: [PATCH v2 02/10] sequencer: introduce new commands to reset the revision

2018-01-30 Thread Eric Sunshine
On Mon, Jan 29, 2018 at 5:54 PM, Johannes Schindelin wrote: > [...] > This commit implements the commands to label, and to reset to, given > revisions. The syntax is: > > label > reset > [...] > > Signed-off-by: Johannes Schindelin

[PATCH v2 02/10] sequencer: introduce new commands to reset the revision

2018-01-29 Thread Johannes Schindelin
In the upcoming commits, we will teach the sequencer to recreate 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