]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'en/rebase-backend'
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Mar 2020 21:28:01 +0000 (14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Mar 2020 21:28:01 +0000 (14:28 -0700)
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

1  2 
builtin/rebase.c
sequencer.c

Simple merge
diff --cc sequencer.c
Simple merge