From: Đoàn Trần Công Danh Date: Fri, 3 Apr 2020 10:28:07 +0000 (+0700) Subject: Documentation: document merge option --no-gpg-sign X-Git-Tag: v2.27.0-rc0~115^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c5bac173d202013750dc28b37107d151ccb921e;p=thirdparty%2Fgit.git Documentation: document merge option --no-gpg-sign Signed-off-by: Đoàn Trần Công Danh Signed-off-by: Junio C Hamano --- diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 40dc4f5e8c..fb3a6e8d42 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -61,9 +61,12 @@ When not possible, refuse to merge and exit with a non-zero status. -S[]:: --gpg-sign[=]:: +--no-gpg-sign:: 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. + 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[=]:: --no-log::