Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-grep: document --and, --or, --not, ( and )
author
Matthias Lederhofer
<matled@gmx.net>
Wed, 2 Aug 2006 22:04:56 +0000
(
00:04
+0200)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 3 Aug 2006 00:05:34 +0000
(17:05 -0700)
[jc: added an example section.]
Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-grep.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
25f38f0
)
diff --git
a/Documentation/git-grep.txt
b/Documentation/git-grep.txt
index 62a8e7f222d480046beee5cf735fa92821e26f8d..dc7683383c3b4dc4c6bede834155ae56132aafc3 100644
(file)
--- a/
Documentation/git-grep.txt
+++ b/
Documentation/git-grep.txt
@@
-16,7
+16,7
@@
SYNOPSIS
[-n] [-l | --files-with-matches] [-L | --files-without-match]
[-c | --count]
[-A <post-context>] [-B <pre-context>] [-C <context>]
[-n] [-l | --files-with-matches] [-L | --files-without-match]
[-c | --count]
[-A <post-context>] [-B <pre-context>] [-C <context>]
- [-f <file>] [-e] <pattern>
+ [-f <file>] [-e] <pattern>
[--and|--or|--not|(|)|-e <pattern>...]
[<tree>...]
[--] [<path>...]
[<tree>...]
[--] [<path>...]
@@
-74,16
+74,30
@@
OPTIONS
-e::
The next parameter is the pattern. This option has to be
used for patterns starting with - and should be used in
-e::
The next parameter is the pattern. This option has to be
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>...`::
Search blobs in the trees for specified patterns.
`<tree>...`::
Search blobs in the trees for specified patterns.
-
`--`
::
+
\--
::
Signals the end of options; the rest of the parameters
are <path> limiters.
Signals the end of options; the rest of the parameters
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
------
Originally written by Linus Torvalds <torvalds@osdl.org>, later
Author
------
Originally written by Linus Torvalds <torvalds@osdl.org>, later