| commit | c9f43012a10c4c4b26b8966fcf8497d8db0a0c06 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Apr 2024 21:49:41 +0000 (30 14:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Apr 2024 21:49:41 +0000 (30 14:49 -0700) | ||
| tree | 6242e94080b3ac945bd6b9c84108b5fd7d5d30ab | treesnapshot (tar.gz zip) |
| parent | 786a3e4b8d754d2b14b1208b98eeb0a554ef19a8 | commitdiff |
| parent | a6c2654f839d508c9c912372a9cad18340d7b59c | commitdiff |
Merge branch 'pw/rebase-m-signoff-fix'
"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"
"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 | diff1 | diff2 | blobhistory |
| sequencer.h | diff1 | diff2 | blobhistory |