On Thu, Nov 15, 2018 at 09:40:38AM +0100, Johannes Schindelin wrote: > From @chucklu: > > > my user case is like this : > > > > When I want to cherr-pick commits from A to G (ABCDEFG), image C and E > > are merge commits. Then I will get lots of popup like: > > > > The previous cherry-pick is now empty, possibly due to conflict > > resolution. > > If you wish to commit it anyway, use: > > > > git commit --allow-empty > > > > If you wish to skip this commit, use: > > > > git reset > > > > Then "git cherry-pick --continue" will resume cherry-picking > > the remaining commits. > > My quick interpretation of this is that the user actually needs a way to > skip silently commits which are now empty.
If it's always intended to be used with cherry-pick, shouldn't cherry-pick learn a --keep-empty (like rebase has)? That would avoid even stopping for this case in the first place. -Peff
