aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2020-04-03 17:28:04 +0700
committerJunio C Hamano <gitster@pobox.com>2020-04-03 11:37:22 -0700
commitae06ba611a3d4cdb1c3d87727d4a30e79a59b5ea (patch)
treecbf8f2aa4f22aa76665b38f0548358fbba1dcfbc /Documentation/git-am.txt
parentcf0ad4d199924073ef485ff60393c8a81edbdbb6 (diff)
downloadgit-ae06ba611a3d4cdb1c3d87727d4a30e79a59b5ea.tar.gz
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>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt5
1 files changed, 4 insertions, 1 deletions
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::