pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 8c700200f55e1a92545cfb8218c8c1ba2cedee68..e019e760b4b4d58dfbe8819941947008319aedac 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -16,7 +16,7 @@ SYNOPSIS
           [-F | --fixed-strings] [-n]
           [-l | --files-with-matches] [-L | --files-without-match]
           [-z | --null]
-          [-c | --count] [--all-match]
+          [-c | --count] [--all-match] [-q | --quiet]
           [--max-depth <depth>]
           [--color | --no-color]
           [-A <post-context>] [-B <pre-context>] [-C <context>]
@@ -98,7 +98,7 @@ OPTIONS
 --files-without-match::
        Instead of showing every matched line, show only the
        names of files that contain (or do not contain) matches.
-       For better compatibility with 'git-diff', --name-only is a
+       For better compatibility with 'git diff', --name-only is a
        synonym for --files-with-matches.
 
 -z::
@@ -158,6 +158,11 @@ OPTIONS
        this flag is specified to limit the match to files that
        have lines to match all of them.
 
+-q::
+--quiet::
+       Do not output matched lines; instead, exit with status 0 when
+       there is a match and with non-zero status when there isn't.
+
 `<tree>...`::
        Search blobs in the trees for specified patterns.