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>

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 40dc4f5e8c6e2d5a59cfbbeea1df7254068a6ed2..fb3a6e8d429acceab689dc22374e13ca0d7e314c 100644 (file)
--- 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[<keyid>]::
 --gpg-sign[=<keyid>]::
+--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[=<n>]::
 --no-log::