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

diff --git a/git-grep.html b/git-grep.html
index a4c233f2..4fb85d56 100644
--- a/git-grep.html
+++ b/git-grep.html
@@ -272,7 +272,7 @@ git-grep(1) Manual Page
 </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,41 @@ 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>
+<div class="literalblock">
+<div class="content">
+<pre><tt>The following are the specific `git-ls-files` options
+that may be given: `-o`, `--cached`, `--deleted`, `--others`,
+`--killed`, `--ignored`, `--modified`, `--exclude=*`,
+`--exclude-from=*`, and `--exclude-per-directory=*`.</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>All other options will be passed to `grep`.</tt></pre>
+</div></div>
 </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 +345,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 21-Jan-2006 23:50:17 PDT
 </div>
 </div>
 </body>