Merge branch 'rs/maint-grep-F' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:01:41 +0000 (13:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:01:41 +0000 (13:01 -0700)
"git grep -e '$pattern'", unlike the case where the patterns are read from
a file, did not treat individual lines in the given pattern argument as
separate regular expressions as it should.

By RenĂ© Scharfe
* rs/maint-grep-F:
  grep: stop leaking line strings with -f
  grep: support newline separated pattern list
  grep: factor out do_append_grep_pat()
  grep: factor out create_grep_pat()

1  2 
Documentation/git-grep.txt
builtin/grep.c
grep.c
grep.h
t/t7810-grep.sh

Simple merge
diff --cc builtin/grep.c
Simple merge
diff --cc grep.c
Simple merge
diff --cc grep.h
Simple merge
diff --cc t/t7810-grep.sh
Simple merge