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>
W. Trevor King committed
Oct 12, 2017 at 02:02 UTC
488aa65c8fdad35869d7ac47180ad1688262788f
2 files changed
+6
-6
Documentation/git-merge.txt
-6
@@ -64,12 +64,6 @@ OPTIONS
64
-------
65
include::merge-options.txt[]
66
67
--S[<keyid>]::
68
---gpg-sign[=<keyid>]::
69
- GPG-sign the resulting merge commit. The `keyid` argument is
70
- optional and defaults to the committer identity; if specified,
71
- it must be stuck to the option without a space.
72
-
67
-m <msg>::
68
Set the commit message to be used for the merge commit (in
69
case one is created).
Documentation/merge-options.txt
+6
@@ -42,6 +42,12 @@ set to `no` at the beginning of them.
42
current `HEAD` is already up-to-date or the merge can be
43
resolved as a fast-forward.
44
45
+-S[<keyid>]::
46
+--gpg-sign[=<keyid>]::
47
+ GPG-sign the resulting merge commit. The `keyid` argument is
48
+ optional and defaults to the committer identity; if specified,
49
+ it must be stuck to the option without a space.
50
+
51
--log[=<n>]::
52
--no-log::
53
In addition to branch names, populate the log message with