Merge branch 'tb/grep-only-matching'

"git grep" learned the "--only-matching" option.

* tb/grep-only-matching:
  grep.c: teach 'git grep --only-matching'
  grep.c: extract show_line_header()

1 files changed, 1 insertions, 0 deletions

diff --git a/grep.h b/grep.h
index 01d2cba6f8..0ba62a11c5 100644
--- a/grep.h
+++ b/grep.h
@@ -163,6 +163,7 @@ struct grep_opt {
 	int relative;
 	int pathname;
 	int null_following_name;
+	int only_matching;
 	int color;
 	int max_depth;
 	int funcname;