summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2017-10-12 09:02:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-12 12:14:23 (GMT)
commit488aa65c8fdad35869d7ac47180ad1688262788f (patch)
tree58802166205aef0501acfefc4f9a4ff806f42b0c /Documentation/git-merge.txt
parent4010f1d1b782eb7585e0e0abcefa794bd5ff29a0 (diff)
downloadgit-488aa65c8fdad35869d7ac47180ad1688262788f.zip
git-488aa65c8fdad35869d7ac47180ad1688262788f.tar.gz
git-488aa65c8fdad35869d7ac47180ad1688262788f.tar.bz2
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>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index f90faf7..1d97a17 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -64,12 +64,6 @@ OPTIONS
-------
include::merge-options.txt[]
--S[<keyid>]::
---gpg-sign[=<keyid>]::
- GPG-sign the resulting merge commit. The `keyid` argument is
- optional and defaults to the committer identity; if specified,
- it must be stuck to the option without a space.
-
-m <msg>::
Set the commit message to be used for the merge commit (in
case one is created).