summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-19 05:45:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-19 05:45:43 (GMT)
commit9f8468be43df74665bfd9fd925d8ab6fc74f963f (patch)
tree0b21244428d8227366c738ee2dfa2a94fe3af808 /Documentation/merge-options.txt
parent660fb3dfa8f3e42b287ee7e27a36ecd2420b89c3 (diff)
parent488aa65c8fdad35869d7ac47180ad1688262788f (diff)
downloadgit-9f8468be43df74665bfd9fd925d8ab6fc74f963f.zip
git-9f8468be43df74665bfd9fd925d8ab6fc74f963f.tar.gz
git-9f8468be43df74665bfd9fd925d8ab6fc74f963f.tar.bz2
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'
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 4e32304..2552ab8 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