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

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index abb6735a40a2b7a9ea893c6c7e3c5e967cd1f2ea..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>]
@@ -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.