Re: What's cooking in git.git (Aug 2021, #06; Mon, 16)

Philippe Blain [off-list ref] writes:

Hi Junio and Phillip,

Le 2021-08-17 à 06:20, Phillip Wood a écrit :

quoted

On 17/08/2021 00:06, Junio C Hamano wrote:

quoted

* pw/rebase-skip-final-fix (2021-08-13) 3 commits
  - rebase --continue: remove .git/MERGE_MSG
  - rebase --apply: restore some tests
  - t3403: fix commit authorship

  Checking out all the paths from HEAD during the last conflicted
  step in "git rebase" and continuing would cause the step to be
  skipped (which is expected), but leaves MERGE_HEAD file behind in

This should be MERGE_MSG, no ?

Yup, you're absolutely right.  Will update.

quoted

quoted

  $GIT_DIR and confuses the next "git commit", which has been
  corrected.

  Will merge to 'next'.

Philippe.