diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-12-13 15:40:35 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-24 14:51:35 -0800 |
commit | 55ca3f99ae4895605a348322dd2fc50f2065f508 (patch) | |
tree | cc01d0ad40b9320db83ac6ee3ac3ab5742ba1d8c /Documentation | |
parent | commit-tree: add the commit.gpgsign option to sign all commits (diff) | |
download | tgif-55ca3f99ae4895605a348322dd2fc50f2065f508.tar.xz |
commit-tree: add and document --no-gpg-sign
Document how to override commit.gpgsign configuration that is set to
true per "git commit" invocation (parse-options machinery lets us
say "--no-gpg-sign" to do so).
"git commit-tree" does not use parse-options, so manually add the
corresponding option for now.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-commit-tree.txt | 5 | ||||
-rw-r--r-- | Documentation/git-commit.txt | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index cafdc9642d..a469eab066 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -55,8 +55,13 @@ OPTIONS from the standard input. -S[<keyid>]:: +--gpg-sign[=<keyid>]:: GPG-sign commit. +--no-gpg-sign:: + Countermand `commit.gpgsign` configuration variable that is + set to force each and every commit to be signed. + Commit Information ------------------ diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 1a7616c73a..7c42e9cabc 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -302,6 +302,10 @@ configuration variable documented in linkgit:git-config[1]. --gpg-sign[=<keyid>]:: GPG-sign commit. +--no-gpg-sign:: + Countermand `commit.gpgsign` configuration variable that is + set to force each and every commit to be signed. + \--:: Do not interpret any more arguments as options. |