| commit | 73af6a4fab3fc570e234f5836dc1e59c3270a716 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Nov 2020 21:17:43 +0000 (2 13:17 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Nov 2020 21:17:43 +0000 (2 13:17 -0800) | ||
| tree | ea53b35e93c552d780776e2d788559951369b462 | treesnapshot (tar.gz zip) |
| parent | 9879f3b3f6dc055099a045c67a1f086d60eb0200 | commitdiff |
| parent | 43ad4f2eca811afe7eb2eb089afc9f501fd8a2c6 | commitdiff |
Merge branch 'sc/sequencer-gpg-octopus'
"git rebase --rebase-merges" did not correctly pass --gpg-sign
command line option to underlying "git merge" when replaying a merge
using non-default merge strategy or when replaying an octopus merge
(because replaying a two-head merge with the default strategy was
done in a separate codepath, the problem did not trigger for most
users), which has been corrected.
* sc/sequencer-gpg-octopus:
t3435: add tests for rebase -r GPG signing
sequencer: pass explicit --no-gpg-sign to merge
sequencer: fix gpg option passed to merge subcommand
"git rebase --rebase-merges" did not correctly pass --gpg-sign
command line option to underlying "git merge" when replaying a merge
using non-default merge strategy or when replaying an octopus merge
(because replaying a two-head merge with the default strategy was
done in a separate codepath, the problem did not trigger for most
users), which has been corrected.
* sc/sequencer-gpg-octopus:
t3435: add tests for rebase -r GPG signing
sequencer: pass explicit --no-gpg-sign to merge
sequencer: fix gpg option passed to merge subcommand
| sequencer.c | diff1 | diff2 | blobhistory |