Skip to content

Commit 5c5bac1

Browse files
sgngitster
authored andcommitted
Documentation: document merge option --no-gpg-sign
Signed-off-by: Đoàn Trần Công Danh <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4369d3a commit 5c5bac1

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Documentation/merge-options.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,12 @@ When not possible, refuse to merge and exit with a non-zero status.
6161

6262
-S[<keyid>]::
6363
--gpg-sign[=<keyid>]::
64+
--no-gpg-sign::
6465
GPG-sign the resulting merge commit. The `keyid` argument is
6566
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`.
6770

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

0 commit comments

Comments
 (0)