diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-30 14:49:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-30 14:49:41 -0700 |
| commit | c9f43012a10c4c4b26b8966fcf8497d8db0a0c06 (patch) | |
| tree | 6242e94080b3ac945bd6b9c84108b5fd7d5d30ab /oidset.c | |
| parent | Git 2.45 (diff) | |
| parent | rebase -m: fix --signoff with conflicts (diff) | |
| download | git-c9f43012a10c4c4b26b8966fcf8497d8db0a0c06.tar.gz git-c9f43012a10c4c4b26b8966fcf8497d8db0a0c06.zip | |
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"
Diffstat (limited to 'oidset.c')
0 files changed, 0 insertions, 0 deletions