diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 20:42:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 20:42:53 (GMT) |
| commit | fc3f6fd7bef30895b3f80c1f8a708f5eeb69695b (patch) | |
| tree | 2f36295ebc5dfd63ee7efb677ac88ad702215b82 /Documentation/git-rebase.txt | |
| parent | 886fcb7aae194a76316177ccb869e1b9b572d49f (diff) | |
| parent | 5c5bac173d202013750dc28b37107d151ccb921e (diff) | |
| download | git-fc3f6fd7bef30895b3f80c1f8a708f5eeb69695b.zip git-fc3f6fd7bef30895b3f80c1f8a708f5eeb69695b.tar.gz git-fc3f6fd7bef30895b3f80c1f8a708f5eeb69695b.tar.bz2 | |
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-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 46ddf17..f0dfaac 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -354,9 +354,12 @@ See also INCOMPATIBLE OPTIONS below. -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`. -q:: --quiet:: |