Merge branch 'master' into next

diff --git a/builtin-grep.c b/builtin-grep.c
index 3d6e515f1f04f07de5d2237dee7cb62c6b66dd24..66111de5148c17a156fdbfbc0d92b0c93c2b2c34 100644 (file)
--- 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)