Thread (53 messages) flat view 53 messages, 4 authors, 2016-06-15

Re: [PATCH 12/14] revert: Introduce --reset to cleanup sequencer data

From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:51:33

Jonathan Nieder wrote:
Ramkumar Ramachandra wrote:
quoted
and it's
possible to achieve this effect in another way: when a conflict is
encountered in the sequencer && length(todo_file) == 1, throw away the
sequencer state.
Yep, that seems like basically the same effect.  Are there downsides?
(Maybe years from now when a "git cherry-pick --rewind" is introduced
we would regret this?  But that can be figured out years from now.)
Doh, I'm not thinking straight.  Would this break "git cherry-pick
--abort", or is there some hack layered on top to avoid that?  Making
"git commit" remove the .git/sequencer for the last commit of the
sequence seems a little saner.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help