summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-25 20:59:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-25 20:59:21 (GMT)
commitedefaa55bf202c2d676a0d48545a3720e58d4135 (patch)
tree2cf04bdd7a10366dd0e7c2707fcd617f2d58b026
parentd9beb468e6d0c493eed00e365d90a69127488caa (diff)
parentf7bf24d4dde9b5ff1bded664864feb7afb7d1c6b (diff)
downloadgit-edefaa55bf202c2d676a0d48545a3720e58d4135.zip
git-edefaa55bf202c2d676a0d48545a3720e58d4135.tar.gz
git-edefaa55bf202c2d676a0d48545a3720e58d4135.tar.bz2
Merge branch 'rm/gpg-program-doc-fix'
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 f999f8e..cce2c89 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