js/advise-rebase-skip, was Re: What's cooking in git.git (Dec 2019, #02; Thu, 5)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Dec 6, 2019, 15:56 UTC
Message-ID: <nycvar.QRO.7.76.6.1912061653370.31080@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqqzhg6xuvc.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Thu, 5 Dec 2019, Junio C Hamano wrote:

Show 11 quoted lines

> * js/advise-rebase-skip (2019-10-23) 3 commits
>  - commit: give correct advice for empty commit during a rebase
>  - sequencer: export the function to get the path of `.git/rebase-merge/`
>  - cherry-pick: add test for `--skip` advice in `git commit`
>
>  The logic used in "git commit" to give hints and errors depending
>  on what operation was in progress learned to distinguish rebase and
>  cherry-pick better.
>
>  Kicked back to 'pu'.
>  cf. <nycvar.QRO.7.76.6.1911081508560.46@tvgsbejvaqbjf.bet>

Phillip already opened a GitGitGadget PR to replace this, and it will soon hit the Git mailing list, I think (or it already did and I missed it): https://github.com/gitgitgadget/git/pull/484

Feel free to drop my patches as soon as you integrate Phillips'.

Ciao, Dscho