From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Fri, 3 Apr 2020 10:28:04 +0000 (+0700)
Subject: Documentation: document am --no-gpg-sign
X-Git-Tag: v2.27.0-rc0~115^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae06ba611a3d4cdb1c3d87727d4a30e79a59b5ea;p=thirdparty%2Fgit.git

Documentation: document am --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/git-am.txt b/Documentation/git-am.txt
index ab5754e05d..38c0852139 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -148,9 +148,12 @@ default.   You can use `--no-utf8` to override this.
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
+--no-gpg-sign::
 	GPG-sign commits. The `keyid` argument is optional and
 	defaults to the committer identity; if specified, it must be
-	stuck to the option without a space.
+	stuck to the option without a space. `--no-gpg-sign` is useful to
+	countermand both `commit.gpgSign` configuration variable, and
+	earlier `--gpg-sign`.
 
 --continue::
 -r::