diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 14:41:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 14:41:44 -0700 |
| commit | 67bf224a9fb3cd34ef712113c48f3144a9bc232a (patch) | |
| tree | b3406220064904e5c16814c16b29375806646762 /merge-options.txt | |
| parent | 0c3c56d58eecca238d9219bfe80754e089939b99 (diff) | |
| download | git-htmldocs-67bf224a9fb3cd34ef712113c48f3144a9bc232a.tar.gz | |
Autogenerated HTML docs for v2.26.2-266-ge8703
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/merge-options.txt b/merge-options.txt index 40dc4f5e8..fb3a6e8d4 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -61,9 +61,12 @@ When not possible, refuse to merge and exit with a non-zero status. -S[<keyid>]:: --gpg-sign[=<keyid>]:: +--no-gpg-sign:: GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, - it must be stuck to the option without a space. + it must be stuck to the option without a space. `--no-gpg-sign` + is useful to countermand both `commit.gpgSign` configuration variable, + and earlier `--gpg-sign`. --log[=<n>]:: --no-log:: |