From: Junio C Hamano <junio@hera.kernel.org>
Date: Fri, 22 Feb 2008 22:57:06 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.4.2-197-g22c43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=074766f3e6232dcb7254da10f6c1cc3c9da1fb0c;p=git.git

Autogenerated HTML docs for v1.5.4.2-197-g22c43
---

diff --git a/git-grep.html b/git-grep.html
index d96f52d1a..ea369821f 100644
--- a/git-grep.html
+++ b/git-grep.html
@@ -395,12 +395,14 @@ registered in the index file, or given tree objects.</p>
 </p>
 </dd>
 <dt>
--l | --files-with-matches | -L | --files-without-match
+-l | --files-with-matches | --name-only | -L | --files-without-match
 </dt>
 <dd>
 <p>
         Instead of showing every matched line, show only the
         names of files that contain (or do not contain) matches.
+        For better compatability with git-diff, --name-only is a
+        synonym for --files-with-matches.
 </p>
 </dd>
 <dt>
@@ -528,7 +530,7 @@ revamped by Junio C Hamano.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 07-Jan-2008 07:50:23 UTC
+Last updated 22-Feb-2008 22:56:35 UTC
 </div>
 </div>
 </body>
diff --git a/git-grep.txt b/git-grep.txt
index f3cb24f25..71a73354f 100644
--- a/git-grep.txt
+++ b/git-grep.txt
@@ -75,9 +75,11 @@ OPTIONS
 -n::
 	Prefix the line number to matching lines.
 
--l | --files-with-matches | -L | --files-without-match::
+-l | --files-with-matches | --name-only | -L | --files-without-match::
 	Instead of showing every matched line, show only the
 	names of files that contain (or do not contain) matches.
+	For better compatability with git-diff, --name-only is a
+	synonym for --files-with-matches.
 
 -c | --count::
 	Instead of showing every matched line, show the number of
diff --git a/git-merge-index.html b/git-merge-index.html
index 95c3d3de1..f8ce82b02 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -272,7 +272,7 @@ git-merge-index(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-merge-index</em> [-o] [-q] &lt;merge-program&gt; (-a | -- | &lt;file&gt;*)</p>
+<p><em>git-merge-index</em> [-o] [-q] &lt;merge-program&gt; (-a | [--] &lt;file&gt;*)</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 07-Jan-2008 07:50:31 UTC
+Last updated 22-Feb-2008 22:56:35 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-index.txt b/git-merge-index.txt
index 5d816d0d8..19ee017ae 100644
--- a/git-merge-index.txt
+++ b/git-merge-index.txt
@@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging
 
 SYNOPSIS
 --------
-'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*)
+'git-merge-index' [-o] [-q] <merge-program> (-a | [--] <file>\*)
 
 DESCRIPTION
 -----------