Merge branch 'wk/merge-options-gpg-sign-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Oct 2017 05:45:43 +0000 (14:45 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Oct 2017 05:45:43 +0000 (14:45 +0900)
commit9f8468be43df74665bfd9fd925d8ab6fc74f963f
tree0b21244428d8227366c738ee2dfa2a94fe3af808
parent660fb3dfa8f3e42b287ee7e27a36ecd2420b89c3
parent488aa65c8fdad35869d7ac47180ad1688262788f
Merge branch 'wk/merge-options-gpg-sign-doc'

Doc updates.

* wk/merge-options-gpg-sign-doc:
  Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
Documentation/git-merge.txt
Documentation/merge-options.txt