Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

From: Philip Oakley <philipoakley@iee.org>
Date: Apr 23, 2018, 20:34 UTC
Message-ID: <0E6803122A5241F98148087A045993BC@PhilipOakley>
In-Reply-To: <nycvar.QRO.7.76.6.1804231401130.15174@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>

From: "Johannes Schindelin" <Johannes.Schindelin@gmx.de> : Monday, April 23, 
2018 1:03 PM
Subject: Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

> Hi Philip,
>

[...]

Show 9 quoted lines

>
>> > label onto
>> >
>> > # Branch abc
>> > reset onto
>>
>> Is this reset strictly necessary. We are already there @head.
>
> No, this is not strictly necessary, but

I've realised my misunderstanding. I was thinking this (and others) was equivalent to

$  git reset <thatHead'onto'> # maybe even --hard,

i.e. affecting the worktree

rather that just being a movement of the Head rev (though I may be having brain fade here regarding untracked files etc..)

Show 10 quoted lines

>
> - it makes it easier to auto-generate (otherwise you would have to keep
>  track of the "current HEAD" while generating that todo list, and
>
> - if I keep the `reset onto` there, then it is *a lot* easier to reorder
>  topic branches.
>
> Ciao,
> Dscho
>

Thanks

Philip