Autogenerated HTML docs for v1.4.2-rc2-gfba0cb

diff --git a/git-grep.html b/git-grep.html
index f9f29d5ee5015ade3ae05d3ca10e478b88f278a4..386db3b0016a04f19f294c920df1b5c3efd1f12d 100644 (file)
--- 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]\r
            [-c | --count]\r
            [-A <post-context>] [-B <pre-context>] [-C <context>]\r
-           [-f <file>] [-e] <pattern>\r
+           [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>…]\r
            [<tree>…]\r
            [--] [&lt;path&gt;&#8230;]</div></div>\r
 </div>\r
@@ -397,7 +397,19 @@ registered in the index file, or given tree objects.</p>
 <p>\r
         The next parameter is the pattern. This option has to be\r
         used for patterns starting with - and should be used in\r
-        scripts passing user input to grep.\r
+        scripts passing user input to grep.  Multiple patterns are\r
+        combined by <em>or</em>.\r
+</p>\r
+</dd>\r
+<dt>\r
+--and | --or | --not | ( | )\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specify how multiple patterns are combined using boolean\r
+        expressions.  <tt>--or</tt> is the default operator.  <tt>--and</tt> has\r
+        higher precedence than <tt>--or</tt>.  <tt>-e</tt> has to be used for all\r
+        patterns.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -409,7 +421,7 @@ registered in the index file, or given tree objects.</p>
 </p>\r
 </dd>\r
 <dt>\r
-<tt>--</tt>\r
+--\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -419,6 +431,20 @@ registered in the index file, or given tree objects.</p>
 </dd>\r
 </dl>\r
 </div>\r
+<h2>Example</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+git grep -e '#define' --and \( -e MAX_PATH -e PATH_MAX \)\r
+</dt>\r
+<dd>\r
+<p>\r
+        Looks for a line that has <tt>#define</tt> and either <tt>MAX_PATH</tt> or\r
+        <tt>PATH_MAX</tt>.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Originally written by Linus Torvalds &lt;torvalds@osdl.org&gt;, later\r
@@ -434,7 +460,7 @@ revamped by Junio C Hamano.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:48 UTC\r
+Last updated 03-Aug-2006 00:29:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.txt b/git-grep.txt
index 62a8e7f222d480046beee5cf735fa92821e26f8d..dc7683383c3b4dc4c6bede834155ae56132aafc3 100644 (file)
--- a/git-grep.txt
+++ b/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>]
-          [-f <file>] [-e] <pattern>
+          [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...]
           [<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
-       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.
 
-`--`::
+\--::
        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