Re: [PATCH 1/2] commit/reset: try to clean up sequencer state

2019-04-08 Thread Phillip Wood
On 01/04/2019 11:09, Duy Nguyen wrote: On Fri, Mar 29, 2019 at 11:32 PM Phillip Wood wrote: From: Phillip Wood When cherry-picking or reverting a sequence of commits and if the final pick/revert has conflicts and the user uses `git commit` to commit the conflict resolution and does not run `

Re: [PATCH 1/2] commit/reset: try to clean up sequencer state

2019-04-08 Thread Phillip Wood
Hi Junio On 01/04/2019 09:28, Junio C Hamano wrote: Phillip Wood writes: From: Phillip Wood When cherry-picking or reverting a sequence of commits and if the final pick/revert has conflicts and the user uses `git commit` to commit the conflict resolution and does not run `git cherry-pick --

Re: [PATCH 1/2] commit/reset: try to clean up sequencer state

2019-04-01 Thread Duy Nguyen
On Fri, Mar 29, 2019 at 11:32 PM Phillip Wood wrote: > > From: Phillip Wood > > When cherry-picking or reverting a sequence of commits and if the final > pick/revert has conflicts and the user uses `git commit` to commit the > conflict resolution and does not run `git cherry-pick --continue` then

Re: [PATCH 1/2] commit/reset: try to clean up sequencer state

2019-04-01 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > When cherry-picking or reverting a sequence of commits and if the final > pick/revert has conflicts and the user uses `git commit` to commit the > conflict resolution and does not run `git cherry-pick --continue` then > the sequencer state is left be