git-merge: document the -S option
The option to gpg sign a merge commit is available but was not documented. Use wording from the git-commit(1) manpage. Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Vigier committed
Oct 15, 2013 at 01:41 UTC
5f737ac91bd869e65bff401ad1108581ac504e22
1 file changed
+5
-1
Documentation/git-merge.txt
+5
-1
@@ -10,7 +10,7 @@ SYNOPSIS
10
--------
11
[verse]
12
'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
13
- [-s <strategy>] [-X <strategy-option>]
13
+ [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
14
[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
15
'git merge' <msg> HEAD <commit>...
16
'git merge' --abort
@@ -65,6 +65,10 @@ OPTIONS
65
-------
66
include::merge-options.txt[]
67
68
+-S[<keyid>]::
69
+--gpg-sign[=<keyid>]::
70
+ GPG-sign the resulting merge commit.
71
+
72
-m <msg>::
73
Set the commit message to be used for the merge commit (in
74
case one is created).