Thread (10 messages) flat view 10 messages, 2 authors, 2016-06-15

Re: [PATCH 0/7] New sequencer workflow!

From: Phil Hord <hidden>
Date: 2016-06-15 22:52:29

On Sun, Nov 13, 2011 at 5:46 AM, Ramkumar Ramachandra
[off-list ref] wrote:
 $ git revert moo..baz
 ... conflict ...
 $ echo "resolved" >problematicfile
 $ git add problematicfile
 $ git sequencer --continue

In other words, it just doesn't matter how you started what sequencing
operation: you can always continue a it with "git sequencer
--continue" and reset it with "git sequencer --reset".

I see that --reset was added to cherry-pick, revert and sequencer
around the same time back in August.  Shouldn't it be spelled
"--abort" instead?

This would align better with other commands that do the same thing
(am, merge, notes-merge, rebase) since they all appear to spell it
"--abort".  Also, it will make it easier in git 2.x when we begin
using "git continue" and "git abort" rather than "git reset".

Phil
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help