diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 13:39:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 13:39:53 -0700 |
| commit | 1eb5609b6b3e2908ee747dfe313c24f17334ce26 (patch) | |
| tree | 7399ab13ecb59275ff9caa0624441831a5b0f8de /git-merge.txt | |
| parent | 70d664063d4eb347c0d30071e08a40fbf72dcd34 (diff) | |
| download | git-htmldocs-1eb5609b6b3e2908ee747dfe313c24f17334ce26.tar.gz | |
Autogenerated HTML docs for v2.6.1-120-g24a00e
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-merge.txt b/git-merge.txt index a62d6729b..07f7295ec 100644 --- a/git-merge.txt +++ b/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 |