]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a56d361 120b1eb)
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)
commitb4f0038525623e0e5aa3b35d520de909618cae98
tree5f4056c2fed1880f4faddb834691ebda724bbf0etree | snapshot
parenta56d361f66a78cabaf594b611d817a528ad1d489commit | diff
parent120b1eb7314687375e0a229e102ffd194cae0e06commit | diff
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
builtin/rebase.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.