Merge branch 'jc/denoise-rm-to-resolve'

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index a74e7b926d030f6f385e49be68714133f6e3c06e..2e5599a67f86ad16969a5ea2697bdeb50ca801a6 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -64,6 +64,13 @@ OPTIONS
 -s::
 --sign::
        Make a GPG-signed tag, using the default e-mail address's key.
+       The default behavior of tag GPG-signing is controlled by `tag.gpgSign`
+       configuration variable if it exists, or disabled oder otherwise.
+       See linkgit:git-config[1].
+
+--no-sign::
+       Override `tag.gpgSign` configuration variable that is
+       set to force each and every tag to be signed.
 
 -u <keyid>::
 --local-user=<keyid>::