summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mars-attacks.org>2013-10-14 23:41:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-18 19:47:33 (GMT)
commit5f737ac91bd869e65bff401ad1108581ac504e22 (patch)
tree2f78631b9b3c0b314dd43c4b30d0545c7b01c387 /Documentation/git-merge.txt
parent92ab409055f6f8e379a7a0af731dbad7e1d43af0 (diff)
downloadgit-5f737ac91bd869e65bff401ad1108581ac504e22.zip
git-5f737ac91bd869e65bff401ad1108581ac504e22.tar.gz
git-5f737ac91bd869e65bff401ad1108581ac504e22.tar.bz2
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>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index a74c371..4395459 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
- [-s <strategy>] [-X <strategy-option>]
+ [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
'git merge' <msg> HEAD <commit>...
'git merge' --abort
@@ -65,6 +65,10 @@ OPTIONS
-------
include::merge-options.txt[]
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+ GPG-sign the resulting merge commit.
+
-m <msg>::
Set the commit message to be used for the merge commit (in
case one is created).