summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2020-04-03 10:28:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-03 18:37:22 (GMT)
commit9da37fe11e039eef68f2a67c7a0fa86165a5c653 (patch)
tree7e95894365640695c59ac4c00b3ad8a2861086a9 /Documentation/git-commit.txt
parentae06ba611a3d4cdb1c3d87727d4a30e79a59b5ea (diff)
downloadgit-9da37fe11e039eef68f2a67c7a0fa86165a5c653.zip
git-9da37fe11e039eef68f2a67c7a0fa86165a5c653.tar.gz
git-9da37fe11e039eef68f2a67c7a0fa86165a5c653.tar.bz2
Documentation: reword commit --no-gpg-sign
Merge with --gpg-sign option, and clarify that --no-gpg-sign also override earlier --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-commit.txt')
-rw-r--r--Documentation/git-commit.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 13f6539..a3baea3 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -348,13 +348,12 @@ changes to tracked files.
-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.
-
---no-gpg-sign::
- Countermand `commit.gpgSign` configuration variable that is
- set to force each and every commit to be signed.
+ stuck to the option without a space. `--no-gpg-sign` is useful to
+ countermand both `commit.gpgSign` configuration variable, and
+ earlier `--gpg-sign`.
\--::
Do not interpret any more arguments as options.