tree 5f4056c2fed1880f4faddb834691ebda724bbf0e
parent a56d361f66a78cabaf594b611d817a528ad1d489
parent 120b1eb7314687375e0a229e102ffd194cae0e06
author Junio C Hamano <gitster@pobox.com> 1584048481 -0700
committer Junio C Hamano <gitster@pobox.com> 1584048481 -0700

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