tree 0b21244428d8227366c738ee2dfa2a94fe3af808
parent 660fb3dfa8f3e42b287ee7e27a36ecd2420b89c3
parent 488aa65c8fdad35869d7ac47180ad1688262788f
author Junio C Hamano <gitster@pobox.com> 1508391943 +0900
committer Junio C Hamano <gitster@pobox.com> 1508391943 +0900

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'