Merge branch 'js/chain-lint-attrfix'

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 0de3493b804b3f71fb5c9fc66dbf2a75c6ab0f0c..a3049af1a36c09325a88ad2cc822ae2891c8974b 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -17,7 +17,7 @@ SYNOPSIS
           [-l | --files-with-matches] [-L | --files-without-match]
           [(-O | --open-files-in-pager) [<pager>]]
           [-z | --null]
-          [-c | --count] [--all-match] [-q | --quiet]
+          [ -o | --only-matching ] [-c | --count] [--all-match] [-q | --quiet]
           [--max-depth <depth>]
           [--color[=<when>] | --no-color]
           [--break] [--heading] [-p | --show-function]
@@ -201,6 +201,11 @@ providing this option will cause it to die.
        Output \0 instead of the character that normally follows a
        file name.
 
+-o::
+--only-matching::
+       Print only the matched (non-empty) parts of a matching line, with each such
+       part on a separate output line.
+
 -c::
 --count::
        Instead of showing every matched line, show the number of