Merge branch 'jk/archive-tar-filter'

diff --git a/builtin/grep.c b/builtin/grep.c
index 42bb87f5446b129c1db3f8e6c23e5a058c641266..cccf8da6d2a600154536ea642250699d9356f148 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -824,6 +824,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                OPT__COLOR(&opt.color, "highlight matches"),
                OPT_BOOLEAN(0, "break", &opt.file_break,
                        "print empty line between matches from different files"),
+               OPT_BOOLEAN(0, "heading", &opt.heading,
+                       "show filename only once above matches from same file"),
                OPT_GROUP(""),
                OPT_CALLBACK('C', NULL, &opt, "n",
                        "show <n> context lines before and after matches",