On Mon, Jul 09, 2018 at 03:33:47PM -0500, Taylor Blau wrote: > [ ... ] > --- > Documentation/git-grep.txt | 7 +++++- > builtin/grep.c | 6 +++++ > grep.c | 51 ++++++++++++++++++++++++++------------ > grep.h | 1 + > t/t7810-grep.sh | 15 +++++++++++ > 5 files changed, 63 insertions(+), 17 deletions(-) > > diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt > index 0de3493b80..a3049af1a3 100644 > --- 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. OK, it seems as if the consensus is (1) take the description as-is from GNU grep, and (2) don't change the existing behavior of "git grep -o '^'". This patch does both of those things, and can be queued as 2/2 in this series. Thanks, everybody :-). > -- > 2.18.0 Thanks, Taylor
