summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-29 12:38:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-29 12:38:12 -0700
commit2b312841a84fbfc4b761f7f9e050a6fbbbad2509 (patch)
tree8a55d96d1b23771fff6854d980fee4c26ac4805a
parentMerge branch 'js/unmap-before-ext-diff' into maint (diff)
parentgpg(docs): use correct --verify syntax (diff)
downloadtgif-2b312841a84fbfc4b761f7f9e050a6fbbbad2509.tar.xz
Merge branch 'rm/gpg-program-doc-fix' into maint
Docfix. * rm/gpg-program-doc-fix: gpg(docs): use correct --verify syntax
-rw-r--r--Documentation/config/gpg.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index f999f8ea49..cce2c89245 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -2,7 +2,7 @@ gpg.program::
Use this custom program instead of "`gpg`" found on `$PATH` when
making or verifying a PGP signature. The program must support the
same command-line interface as GPG, namely, to verify a detached
- signature, "`gpg --verify $file - <$signature`" is run, and the
+ signature, "`gpg --verify $signature - <$file`" 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 "`gpg -bsau $key`" is fed with the contents to be