diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:33 -0700 |
| commit | be4d6f4c7f94541fac1a06e4c04acc2d60de1f8c (patch) | |
| tree | b4280f474cec388974fd48b61f5cac669433a169 /Documentation/git-merge.txt | |
| parent | Merge branch 'pt/pull-builtin' into maint (diff) | |
| parent | Documentation: explain optional arguments better (diff) | |
| download | tgif-be4d6f4c7f94541fac1a06e4c04acc2d60de1f8c.tar.xz | |
Merge branch 'mm/keyid-docs' into maint
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.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a62d6729b9..07f7295ec8 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 |