Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 4785f1c5c657ec42baa48d6a657f535e86df0595..3bec0368831a04bc3653f11d3a0b1bff5a335907 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -31,7 +31,9 @@ SYNOPSIS
 DESCRIPTION
 -----------
 Look for specified patterns in the tracked files in the work tree, blobs
-registered in the index file, or blobs in given tree objects.
+registered in the index file, or blobs in given tree objects.  Patterns
+are lists of one or more search expressions separated by newline
+characters.  An empty string as search expression matches all lines.
 
 
 CONFIGURATION