Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
commit488aa65c8fdad35869d7ac47180ad1688262788f
authorW. Trevor King <wking@tremily.us>
Thu, 12 Oct 2017 09:02:17 +0000 (12 02:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Oct 2017 12:14:23 +0000 (12 21:14 +0900)
tree58802166205aef0501acfefc4f9a4ff806f42b0c
parent4010f1d1b782eb7585e0e0abcefa794bd5ff29a0
Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'

Pull has supported these since ea230d8 (pull: add the --gpg-sign
option, 2014-02-10).  Insert in long-option alphabetical order
following 7c85d274 (Documentation/merge-options.txt: order options
in alphabetical groups, 2009-10-22).

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge.txt
Documentation/merge-options.txt