]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dd/no-gpg-sign'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:52 +0000 (13:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:53 +0000 (13:42 -0700)
"git rebase" learned the "--no-gpg-sign" option to countermand
commit.gpgSign the user may have.

* dd/no-gpg-sign:
  Documentation: document merge option --no-gpg-sign
  Documentation: merge commit-tree --[no-]gpg-sign
  Documentation: reword commit --no-gpg-sign
  Documentation: document am --no-gpg-sign
  cherry-pick/revert: honour --no-gpg-sign in all case
  rebase.c: honour --no-gpg-sign

1  2 
Documentation/git-rebase.txt
builtin/rebase.c
sequencer.c

Simple merge
Simple merge
diff --cc sequencer.c
Simple merge