diff options
Diffstat (limited to 'third_party/git/Documentation/git-cherry-pick.txt')
| -rw-r--r-- | third_party/git/Documentation/git-cherry-pick.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/third_party/git/Documentation/git-cherry-pick.txt b/third_party/git/Documentation/git-cherry-pick.txt index 83ce51aedfea..75feeef08a0e 100644 --- a/third_party/git/Documentation/git-cherry-pick.txt +++ b/third_party/git/Documentation/git-cherry-pick.txt @@ -109,9 +109,12 @@ effect to your index in a row. -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`. --ff:: If the current HEAD is the same as the parent of the |