git-grep: document --and, --or, --not, ( and )
[jc: added an example section.] Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
25f38f064f
commit
fba0cbd95d
@ -16,7 +16,7 @@ SYNOPSIS
|
|||||||
[-n] [-l | --files-with-matches] [-L | --files-without-match]
|
[-n] [-l | --files-with-matches] [-L | --files-without-match]
|
||||||
[-c | --count]
|
[-c | --count]
|
||||||
[-A <post-context>] [-B <pre-context>] [-C <context>]
|
[-A <post-context>] [-B <pre-context>] [-C <context>]
|
||||||
[-f <file>] [-e] <pattern>
|
[-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...]
|
||||||
[<tree>...]
|
[<tree>...]
|
||||||
[--] [<path>...]
|
[--] [<path>...]
|
||||||
|
|
||||||
@ -74,16 +74,30 @@ OPTIONS
|
|||||||
-e::
|
-e::
|
||||||
The next parameter is the pattern. This option has to be
|
The next parameter is the pattern. This option has to be
|
||||||
used for patterns starting with - and should be used in
|
used for patterns starting with - and should be used in
|
||||||
scripts passing user input to grep.
|
scripts passing user input to grep. Multiple patterns are
|
||||||
|
combined by 'or'.
|
||||||
|
|
||||||
|
--and | --or | --not | ( | )::
|
||||||
|
Specify how multiple patterns are combined using boolean
|
||||||
|
expressions. `--or` is the default operator. `--and` has
|
||||||
|
higher precedence than `--or`. `-e` has to be used for all
|
||||||
|
patterns.
|
||||||
|
|
||||||
`<tree>...`::
|
`<tree>...`::
|
||||||
Search blobs in the trees for specified patterns.
|
Search blobs in the trees for specified patterns.
|
||||||
|
|
||||||
`--`::
|
\--::
|
||||||
Signals the end of options; the rest of the parameters
|
Signals the end of options; the rest of the parameters
|
||||||
are <path> limiters.
|
are <path> limiters.
|
||||||
|
|
||||||
|
|
||||||
|
Example
|
||||||
|
-------
|
||||||
|
|
||||||
|
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`.
|
||||||
|
|
||||||
Author
|
Author
|
||||||
------
|
------
|
||||||
Originally written by Linus Torvalds <torvalds@osdl.org>, later
|
Originally written by Linus Torvalds <torvalds@osdl.org>, later
|
||||||
|
Reference in New Issue
Block a user