diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-15 18:26:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-15 18:26:34 -0700 |
| commit | 35702a983e2d8e6bb7b0ebff4016648f407366a2 (patch) | |
| tree | 23bebcc63a28eac4de30d28465d27b8a433fb9b3 /builtin-grep.c | |
| parent | Merge branch 'jc/apply' into next (diff) | |
| parent | Merge branch 'lt/oneway' (diff) | |
| download | tgif-35702a983e2d8e6bb7b0ebff4016648f407366a2.tar.xz | |
Merge branch 'master' into next
* master:
Fix silly typo in new builtin grep
Fix pack-index issue on 64-bit platforms a bit more portably.
Install git-send-email by default
Fix compilation on newer NetBSD systems
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 3d6e515f1f..66111de514 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -455,7 +455,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) push_arg("grep"); push_arg("-H"); if (opt->fixed) - push_arg("-H"); + push_arg("-F"); if (opt->linenum) push_arg("-n"); if (opt->regflags & REG_EXTENDED) |