summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-27 09:56:45 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-27 09:56:45 -0700
commit3a764599229e8263479c537072941f6377531cc1 (patch)
treebc20dfb995882daaf0388e4024b254f3267bbf10
parent47640538150d082482842104e1893bcbc07f575d (diff)
parentbc91316781f77f005a16aea54bf7ad0ce24e2dbc (diff)
downloadgit-3a764599229e8263479c537072941f6377531cc1.tar.gz
Merge branch 'dn/gpg-doc'
The documentation tries to consistently spell "GPG"; when referring to the specific program name, "gpg" is used. * dn/gpg-doc: Documentation: GPG capitalization
-rw-r--r--Documentation/git-tag.txt2
-rw-r--r--Documentation/git-verify-commit.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 4b1c1b8e5c..6b89393746 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -78,7 +78,7 @@ OPTIONS
-v::
--verify::
- Verify the gpg signature of the given tag names.
+ Verify the GPG signature of the given tag names.
-n<num>::
<num> specifies how many lines from the annotation, if any,
diff --git a/Documentation/git-verify-commit.txt b/Documentation/git-verify-commit.txt
index ecf4da16cf..92097f6673 100644
--- a/Documentation/git-verify-commit.txt
+++ b/Documentation/git-verify-commit.txt
@@ -12,7 +12,7 @@ SYNOPSIS
DESCRIPTION
-----------
-Validates the gpg signature created by 'git commit -S'.
+Validates the GPG signature created by 'git commit -S'.
OPTIONS
-------