From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 May 2018 05:38:18 +0000 (+0900)
Subject: Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'
X-Git-Tag: v2.18.0-rc0~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a3bf32b6c7e5d832e02f30a78ad23dc6ba15dcc;p=thirdparty%2Fgit.git

Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'

"git rebase -i" sometimes left intermediate "# This is a
combination of N commits" message meant for the human consumption
inside an editor in the final result in certain corner cases, which
has been fixed.

* js/rebase-i-clean-msg-after-fixup-continue:
  rebase --skip: clean up commit message after a failed fixup/squash
  sequencer: always commit without editing when asked for
  rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON
  rebase -i: demonstrate bugs with fixup!/squash! commit messages
---

4a3bf32b6c7e5d832e02f30a78ad23dc6ba15dcc