diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:53 -0700 |
| commit | fc3f6fd7bef30895b3f80c1f8a708f5eeb69695b (patch) | |
| tree | 2f36295ebc5dfd63ee7efb677ac88ad702215b82 /Documentation/git-commit-tree.txt | |
| parent | Merge branch 'js/t0007-typofix' (diff) | |
| parent | Documentation: document merge option --no-gpg-sign (diff) | |
| download | git-fc3f6fd7bef30895b3f80c1f8a708f5eeb69695b.tar.gz git-fc3f6fd7bef30895b3f80c1f8a708f5eeb69695b.zip | |
Merge branch 'dd/no-gpg-sign'
"git rebase" learned the "--no-gpg-sign" option to countermand
commit.gpgSign the user may have.
* dd/no-gpg-sign:
Documentation: document merge option --no-gpg-sign
Documentation: merge commit-tree --[no-]gpg-sign
Documentation: reword commit --no-gpg-sign
Documentation: document am --no-gpg-sign
cherry-pick/revert: honour --no-gpg-sign in all case
rebase.c: honour --no-gpg-sign
Diffstat (limited to 'Documentation/git-commit-tree.txt')
| -rw-r--r-- | Documentation/git-commit-tree.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index ec15ee8d6f..2e2c581098 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -61,13 +61,11 @@ OPTIONS -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:: - Do not GPG-sign commit, to countermand a `--gpg-sign` option - given earlier on the command line. + stuck to the option without a space. `--no-gpg-sign` is useful to + countermand a `--gpg-sign` option given earlier on the command line. Commit Information ------------------ |