diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-27 17:50:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-27 23:59:09 -0700 |
| commit | 0ab7befa31d07fe3ffb51a6cc626d4c09ded1c92 (patch) | |
| tree | e72f754dde2eb05fa8da2c1acfbcf5b03cbdc5e9 /Documentation | |
| parent | 2d5b459107cf07bbb307cfb196c2007c497a6dd2 (diff) | |
| download | git-0ab7befa31d07fe3ffb51a6cc626d4c09ded1c92.tar.gz git-0ab7befa31d07fe3ffb51a6cc626d4c09ded1c92.tar.xz | |
grep --all-match
This lets you say:
git grep --all-match -e A -e B -e C
to find lines that match A or B or C but limit the matches from
the files that have all of A, B and C.
This is different from
git grep -e A --and -e B --and -e C
in that the latter looks for a single line that has all of these
at the same time.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-grep.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index d8af4d961..bfbece986 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -14,7 +14,7 @@ SYNOPSIS [-v | --invert-match] [-h|-H] [--full-name] [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] [-n] [-l | --files-with-matches] [-L | --files-without-match] - [-c | --count] + [-c | --count] [--all-match] [-A <post-context>] [-B <pre-context>] [-C <context>] [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...] [<tree>...] @@ -96,6 +96,11 @@ OPTIONS higher precedence than `--or`. `-e` has to be used for all patterns. +--all-match:: + When giving multiple pattern expressions combined with `--or`, + this flag is specified to limit the match to files that + have lines to match all of them. + `<tree>...`:: Search blobs in the trees for specified patterns. @@ -111,6 +116,10 @@ git grep -e \'#define\' --and \( -e MAX_PATH -e PATH_MAX \):: Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`. +git grep --all-match -e NODE -e Unexpected:: + Looks for a line that has `NODE` or `Unexpected` in + files that have lines that match both. + Author ------ Originally written by Linus Torvalds <torvalds@osdl.org>, later |