From: Junio C Hamano Date: Mon, 01 Apr 2019 08:34:51 GMT Subject: Re: [PATCH 2/2] fix cherry-pick/revert status after commit Message-ID: In-Reply-To: <20190329163009.493-3-phillip.wood123@gmail.com> Phillip Wood writes: > From: Phillip Wood > > If the user commits a conflict resolution using 'git commit' during a > sequence of picks then 'git status' missed the fact that a > cherry-pick/revert is still in progress. How well would this play with the previous step? Didn't the change to builtin/commit.c made in [1/2] mean that after 'git commit' that concludes the last step, there is nothing 'git status' to notice?