From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Nov 2020 21:17:43 +0000 (-0800)
Subject: Merge branch 'sc/sequencer-gpg-octopus'
X-Git-Tag: v2.30.0-rc0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73af6a4fab3fc570e234f5836dc1e59c3270a716;p=thirdparty%2Fgit.git

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
---

73af6a4fab3fc570e234f5836dc1e59c3270a716