development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'wk/merge-options-gpg-sign-doc'

Browse source 
Doc updates.

* wk/merge-options-gpg-sign-doc:
  Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
This commit is contained in:
Junio C Hamano 2017-10-19 14:45:43 +09:00
parent 660fb3dfa8 488aa65c8f
commit 9f8468be43
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/git-merge.txt
View file

@ -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).

6
Documentation/merge-options.txt
View file

@ -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