aboutsummaryrefslogtreecommitdiff
path: root/builtin-grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-18 22:08:58 -0700
committerJunio C Hamano <junkio@cox.net>2006-10-18 22:08:58 -0700
commit9100c9dce166318d6962b9e6a498bd4dcecdacf4 (patch)
tree1cb3ee55500e161be882994413d08b01a901390c /builtin-grep.c
parent17250ac172b44acd3bdf4ddffb4ed6d915b69246 (diff)
parent70d0afba914ddcf8c8a0144e5c6519d43d641dd9 (diff)
downloadgit-9100c9dce166318d6962b9e6a498bd4dcecdacf4.tar.xz
Merge branch 'jc/grep'
* jc/grep: teach revision walker about --all-match. grep --all-match
Diffstat (limited to 'builtin-grep.c')
-rw-r--r--builtin-grep.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin-grep.c b/builtin-grep.c
index 4205e5d38d..ad7dc00cde 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -596,6 +596,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
GREP_CLOSE_PAREN);
continue;
}
+ if (!strcmp("--all-match", arg)) {
+ opt.all_match = 1;
+ continue;
+ }
if (!strcmp("-e", arg)) {
if (1 < argc) {
append_grep_pattern(&opt, argv[1],