Re: [PATCH 3/3] commit: give correct advice for empty commit during a rebase

2019-10-22 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > Note: we take pains to handle the situation when a user runs a `git > cherry-pick` _during_ a rebase. This is quite valid (e.g. in an `exec` > line in an interactive rebase). On the other hand, it is not possible to > run a rebase during a cherry-p

[PATCH 3/3] commit: give correct advice for empty commit during a rebase

2019-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In dcb500dc16c (cherry-pick/revert: advise using --skip, 2019-07-02), `git commit` learned to suggest to run `git cherry-pick --skip` when trying to cherry-pick an empty patch. However, it was overlooked that there are more conditions than just a `git cherry-pick` when