mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'wk/merge-options-gpg-sign-doc'
Doc updates. * wk/merge-options-gpg-sign-doc: Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
This commit is contained in:
commit
9f8468be43
|
@ -72,12 +72,6 @@ include::merge-options.txt[]
|
|||
agrees to a Developer Certificate of Origin
|
||||
(see http://developercertificate.org/ for more information).
|
||||
|
||||
-S[<keyid>]::
|
||||
--gpg-sign[=<keyid>]::
|
||||
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
|
||||
case one is created).
|
||||
|
|
|
@ -42,6 +42,12 @@ set to `no` at the beginning of them.
|
|||
current `HEAD` is already up to date or the merge can be
|
||||
resolved as a fast-forward.
|
||||
|
||||
-S[<keyid>]::
|
||||
--gpg-sign[=<keyid>]::
|
||||
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.
|
||||
|
||||
--log[=<n>]::
|
||||
--no-log::
|
||||
In addition to branch names, populate the log message with
|
||||
|
|
Loading…
Reference in a new issue