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>
Đoàn Trần Công Danh committed
Apr 3, 2020 at 17:28 UTC
5c5bac173d202013750dc28b37107d151ccb921e
1 file changed
+4
-1
Documentation/merge-options.txt
+4
-1
@@ -61,9 +61,12 @@ When not possible, refuse to merge and exit with a non-zero status.
61
62
-S[<keyid>]::
63
--gpg-sign[=<keyid>]::
64
+--no-gpg-sign::
65
GPG-sign the resulting merge commit. The `keyid` argument is
66
optional and defaults to the committer identity; if specified,
66
- it must be stuck to the option without a space.
67
+ it must be stuck to the option without a space. `--no-gpg-sign`
68
+ is useful to countermand both `commit.gpgSign` configuration variable,
69
+ and earlier `--gpg-sign`.
70
71
--log[=<n>]::
72
--no-log::