summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.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/git-merge.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/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 4df6431..3c6927b 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -72,12 +72,6 @@ include::merge-options.txt[]
agrees to a Developer Certificate of Origin
(see http://developercertificate.org/ for more information).
--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).