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 /git-merge.html | |
| parent | 0c3c56d58eecca238d9219bfe80754e089939b99 (diff) | |
| download | git-htmldocs-67bf224a9fb3cd34ef712113c48f3144a9bc232a.tar.gz | |
Autogenerated HTML docs for v2.26.2-266-ge8703
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index 0b243e982..2cfbc1ac8 100644 --- a/git-merge.html +++ b/git-merge.html @@ -892,11 +892,16 @@ When not possible, refuse to merge and exit with a non-zero status.</p></div> <dt class="hdlist1">
--gpg-sign[=<keyid>]
</dt>
+<dt class="hdlist1">
+--no-gpg-sign
+</dt>
<dd>
<p>
GPG-sign the resulting merge commit. The <code>keyid</code> 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. <code>--no-gpg-sign</code>
+ is useful to countermand both <code>commit.gpgSign</code> configuration variable,
+ and earlier <code>--gpg-sign</code>.
</p>
</dd>
<dt class="hdlist1">
|