diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-08-03 00:29:36 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-08-03 00:29:36 +0000 |
| commit | 0044202b4bbf691ffa5a2c31a8e0064a3561beeb (patch) | |
| tree | bb74ae18a2595a2eb128b50aff808bdb2bff664e /git-grep.html | |
| parent | d7e630450ba46f877696b394e693cabcdb61308f (diff) | |
| download | git-htmldocs-0044202b4bbf691ffa5a2c31a8e0064a3561beeb.tar.gz | |
Autogenerated HTML docs for v1.4.2-rc2-gfba0cb
Diffstat (limited to 'git-grep.html')
| -rw-r--r-- | git-grep.html | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/git-grep.html b/git-grep.html index f9f29d5ee..386db3b00 100644 --- a/git-grep.html +++ b/git-grep.html @@ -280,7 +280,7 @@ git-grep(1) Manual Page [-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>…]</div></div>
</div>
@@ -397,7 +397,19 @@ registered in the index file, or given tree objects.</p> <p>
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 <em>or</em>.
+</p>
+</dd>
+<dt>
+--and | --or | --not | ( | )
+</dt>
+<dd>
+<p>
+ Specify how multiple patterns are combined using boolean
+ expressions. <tt>--or</tt> is the default operator. <tt>--and</tt> has
+ higher precedence than <tt>--or</tt>. <tt>-e</tt> has to be used for all
+ patterns.
</p>
</dd>
<dt>
@@ -409,7 +421,7 @@ registered in the index file, or given tree objects.</p> </p>
</dd>
<dt>
-<tt>--</tt>
+--
</dt>
<dd>
<p>
@@ -419,6 +431,20 @@ registered in the index file, or given tree objects.</p> </dd>
</dl>
</div>
+<h2>Example</h2>
+<div class="sectionbody">
+<dl>
+<dt>
+git grep -e '#define' --and \( -e MAX_PATH -e PATH_MAX \)
+</dt>
+<dd>
+<p>
+ Looks for a line that has <tt>#define</tt> and either <tt>MAX_PATH</tt> or
+ <tt>PATH_MAX</tt>.
+</p>
+</dd>
+</dl>
+</div>
<h2>Author</h2>
<div class="sectionbody">
<p>Originally written by Linus Torvalds <torvalds@osdl.org>, later
@@ -434,7 +460,7 @@ revamped by Junio C Hamano.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 15-Jul-2006 01:37:48 UTC
+Last updated 03-Aug-2006 00:29:31 UTC
</div>
</div>
</body>
|