]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'pw/rebase-m-signoff-fix' into maint-2.45
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Jun 2024 22:53:06 +0000 (15:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Jun 2024 22:53:06 +0000 (15:53 -0700)
commit332bcf74eab28b8dd9d93de3358de3e13d1aaba1
tree964bc97377340319d9ca7709227b7bd9eca1aa34
parent715ae273822aeba4cbc5c09803d1187acdf2ed86
parenta6c2654f839d508c9c912372a9cad18340d7b59c
Merge branch 'pw/rebase-m-signoff-fix' into maint-2.45

"git rebase --signoff" used to forget that it needs to add a
sign-off to the resulting commit when told to continue after a
conflict stops its operation.

* pw/rebase-m-signoff-fix:
  rebase -m: fix --signoff with conflicts
  sequencer: store commit message in private context
  sequencer: move current fixups to private context
  sequencer: start removing private fields from public API
  sequencer: always free "struct replay_opts"
sequencer.c
sequencer.h