diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:01:41 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:01:41 -0700 |
commit | 2147cb2762c67d0ec2101ab13a4c1b0ef8cab599 (patch) | |
tree | 7dccda03b60264e9922edc9bbcad3d4942d77f10 /Documentation | |
parent | Merge branch 'jk/ident-split-fix' into maint (diff) | |
parent | grep: stop leaking line strings with -f (diff) | |
download | tgif-2147cb2762c67d0ec2101ab13a4c1b0ef8cab599.tar.xz |
Merge branch 'rs/maint-grep-F' into maint
"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()
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-grep.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 4785f1c5c6..3bec036883 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -31,7 +31,9 @@ SYNOPSIS DESCRIPTION ----------- Look for specified patterns in the tracked files in the work tree, blobs -registered in the index file, or blobs in given tree objects. +registered in the index file, or blobs in given tree objects. Patterns +are lists of one or more search expressions separated by newline +characters. An empty string as search expression matches all lines. CONFIGURATION |