Browse Source

Documentation: document merge option --no-gpg-sign

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Đoàn Trần Công Danh 5 years ago committed by Junio C Hamano
parent
commit
5c5bac173d
  1. 5
      Documentation/merge-options.txt

5
Documentation/merge-options.txt

@ -61,9 +61,12 @@ When not possible, refuse to merge and exit with a non-zero status.


-S[<keyid>]:: -S[<keyid>]::
--gpg-sign[=<keyid>]:: --gpg-sign[=<keyid>]::
--no-gpg-sign::
GPG-sign the resulting merge commit. The `keyid` argument is GPG-sign the resulting merge commit. The `keyid` argument is
optional and defaults to the committer identity; if specified, optional and defaults to the committer identity; if specified,
it must be stuck to the option without a space. it must be stuck to the option without a space. `--no-gpg-sign`
is useful to countermand both `commit.gpgSign` configuration variable,
and earlier `--gpg-sign`.


--log[=<n>]:: --log[=<n>]::
--no-log:: --no-log::

Loading…
Cancel
Save