tree d68301794c56e93d4ab61f40b8397ed8a1a7b8ef
parent 9a0fa1709c188d8be05aa573fa914d115f55aab1
parent 430b75f7209c554d88e3554eb54cebf4ba1e4608
author Junio C Hamano <gitster@pobox.com> 1585169863 -0700
committer Junio C Hamano <gitster@pobox.com> 1585169863 -0700

Merge branch 'pw/advise-rebase-skip'

The mechanism to prevent "git commit" from making an empty commit
or amending during an interrupted cherry-pick was broken during the
rewrite of "git rebase" in C, which has been corrected.

* pw/advise-rebase-skip:
  commit: give correct advice for empty commit during a rebase
  commit: encapsulate determine_whence() for sequencer
  commit: use enum value for multiple cherry-picks
  sequencer: write CHERRY_PICK_HEAD for reword and edit
  cherry-pick: check commit error messages
  cherry-pick: add test for `--skip` advice in `git commit`
  t3404: use test_cmp_rev