merge/pull: verify GPG signatures of commits being merged

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index cfecf848fb330333a655b0a54d58000041b73338..50d46e1a7bae054d7c1afdeb01b9174a3a9c7002 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -61,7 +61,7 @@ OPTIONS
        blobs registered in the index file.
 
 --no-index::
-       Search files in the current directory that is not managed by git.
+       Search files in the current directory that is not managed by Git.
 
 --untracked::
        In addition to searching in the tracked files in the working