diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:43 -0800 |
| commit | 73af6a4fab3fc570e234f5836dc1e59c3270a716 (patch) | |
| tree | ea53b35e93c552d780776e2d788559951369b462 /Documentation/git-merge-tree.txt | |
| parent | Merge branch 'en/test-selector' (diff) | |
| parent | t3435: add tests for rebase -r GPG signing (diff) | |
| download | tgif-73af6a4fab3fc570e234f5836dc1e59c3270a716.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions