X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-grep.html;h=11f2f7e7b2f09a9ccedbb15cd72d6bfcb10ff4ce;hb=a8adb1ec550d7d7a66cd4d362cfbd01795d71f43;hp=a4c233f247dc96f166a58c5dc21a4e6ff4def91c;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git

diff --git a/git-grep.html b/git-grep.html
index a4c233f2..11f2f7e7 100644
--- a/git-grep.html
+++ b/git-grep.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -266,13 +266,13 @@ git-grep(1) Manual Page
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-grep -
-   print lines matching a pattern
+   Print lines matching a pattern
 </p>
 </div>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-grep</em> &lt;option&gt;&#8230; &lt;pattern&gt; &lt;path&gt;&#8230;</p>
+<p><em>git-grep</em> [&lt;option&gt;&#8230;] [-e] &lt;pattern&gt; [--] [&lt;path&gt;&#8230;]</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -283,21 +283,35 @@ containing a match to the given pattern.</p>
 <div class="sectionbody">
 <dl>
 <dt>
+<tt>--</tt>
+</dt>
+<dd>
+<p>
+        Signals the end of options; the rest of the parameters
+        are &lt;path&gt; limiters.
+</p>
+</dd>
+<dt>
 &lt;option&gt;&#8230;
 </dt>
 <dd>
 <p>
         Either an option to pass to <tt>grep</tt> or <tt>git-ls-files</tt>.
-        Some <tt>grep</tt> options, such as <tt>-C</tt> and <tt>-m</tt>, that take
-        parameters are known to <tt>git-grep</tt>.
 </p>
+<p>The following are the specific <tt>git-ls-files</tt> options
+that may be given: <tt>-o</tt>, <tt>--cached</tt>, <tt>--deleted</tt>, <tt>--others</tt>,
+<tt>--killed</tt>, <tt>--ignored</tt>, <tt>--modified</tt>, <tt>--exclude=*</tt>,
+<tt>--exclude-from=*</tt>, and <tt>--exclude-per-directory=*</tt>.</p>
+<p>All other options will be passed to <tt>grep</tt>.</p>
 </dd>
 <dt>
 &lt;pattern&gt;
 </dt>
 <dd>
 <p>
-        The pattern to look for.
+        The pattern to look for.  The first non option is taken
+        as the pattern; if your pattern begins with a dash, use
+        <tt>-e &lt;pattern&gt;</tt>.
 </p>
 </dd>
 <dt>
@@ -325,7 +339,7 @@ containing a match to the given pattern.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2005 00:16:10 PDT
+Last updated 24-Mar-2006 08:11:01 UTC
 </div>
 </div>
 </body>
