summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.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/merge-options.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/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 5b4a62e..6d85a76 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -42,6 +42,12 @@ set to `no` at the beginning of them.
current `HEAD` is already up-to-date or the merge can be
resolved as a fast-forward.
+-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.
+
--log[=<n>]::
--no-log::
In addition to branch names, populate the log message with