summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-06 13:06:36 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-06 13:06:36 -0700
commit17eb7a785851969f02f3b1736f5da11e9aa14949 (patch)
treecb6ca187172c8d07ed23d50a8ac85a737c560a84
parent7f223b108dfc81d6917b53aa2b3f8d062aa0508d (diff)
parentbc91316781f77f005a16aea54bf7ad0ce24e2dbc (diff)
downloadgit-17eb7a785851969f02f3b1736f5da11e9aa14949.tar.gz
Merge branch 'dn/gpg-doc' into maint
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
-------