summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-05 19:30:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-05 19:30:26 (GMT)
commite13d854322ad802213aea13409505c765b5c68d1 (patch)
tree5517efbeafd23b49f4ff7dbcb769ac90749bb180 /Documentation/git-merge.txt
parente437cbd01564f0c31fad068fa1f88feea5d806da (diff)
parent2b594bf90d84fd96f2b1fe904c1e62e391ceb4a0 (diff)
downloadgit-e13d854322ad802213aea13409505c765b5c68d1.zip
git-e13d854322ad802213aea13409505c765b5c68d1.tar.gz
git-e13d854322ad802213aea13409505c765b5c68d1.tar.bz2
Merge branch 'mm/keyid-docs'
Very small number of options take a parameter that is optional (which is not a great UI element as they can only appear at the end of the command line). Add notice to documentation of each and every one of them. * mm/keyid-docs: Documentation: explain optional arguments better Documentation/grep: fix documentation of -O Documentation: use 'keyid' consistently, not 'key-id'
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index a62d672..07f7295 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[<key-id>]]
+ [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
'git merge' <msg> HEAD <commit>...
'git merge' --abort
@@ -67,7 +67,9 @@ include::merge-options.txt[]
-S[<keyid>]::
--gpg-sign[=<keyid>]::
- GPG-sign the resulting merge commit.
+ 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