diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 15:26:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 15:26:52 -0700 |
commit | 3659495acd5a06a509fdf94838c91a0d9c359e86 (patch) | |
tree | 1d80618ce53423d91fb15f360760953711fa769c /git-config.html | |
parent | a42e033b20a199fda9e2d77917e9a32105d98bb8 (diff) | |
download | git-htmldocs-3659495acd5a06a509fdf94838c91a0d9c359e86.tar.gz |
Autogenerated HTML docs for v2.22.0-643-g3034da
Diffstat (limited to 'git-config.html')
-rw-r--r-- | git-config.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-config.html b/git-config.html index 55b375bf3..5e8f9274a 100644 --- a/git-config.html +++ b/git-config.html @@ -5403,7 +5403,7 @@ gpg.program Use this custom program instead of "<code>gpg</code>" found on <code>$PATH</code> when
making or verifying a PGP signature. The program must support the
same command-line interface as GPG, namely, to verify a detached
- signature, "<code>gpg --verify $file - <$signature</code>" is run, and the
+ signature, "<code>gpg --verify $signature - <$file</code>" is run, and the
program is expected to signal a good signature by exiting with
code 0, and to generate an ASCII-armored detached signature, the
standard input of "<code>gpg -bsau $key</code>" is fed with the contents to be
@@ -6528,7 +6528,8 @@ log.mailmap <dd>
<p>
If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
- <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>.
+ <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>, otherwise
+ assume <code>--no-use-mailmap</code>. False by default.
</p>
</dd>
<dt class="hdlist1">
|