From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Mar 2020 21:28:01 +0000 (-0700)
Subject: Merge branch 'en/rebase-backend'
X-Git-Tag: v2.26.0-rc2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4f0038525623e0e5aa3b35d520de909618cae98;p=thirdparty%2Fgit.git

Merge branch 'en/rebase-backend'

Band-aid fixes for two fallouts from switching the default "rebase"
backend.

* en/rebase-backend:
  git-rebase.txt: highlight backend differences with commit rewording
  sequencer: clear state upon dropping a become-empty commit
  i18n: unmark a message in rebase.c
---

b4f0038525623e0e5aa3b35d520de909618cae98