Autogenerated HTML docs for v1.5.4.2-197-g22c43

diff --git a/git-grep.html b/git-grep.html
index d96f52d1a25c110a7ed3d03be127928f5cbb74f5..ea369821f4e963cd98d164aaa1cc1338ee75ab48 100644 (file)
--- a/git-grep.html
+++ b/git-grep.html
@@ -395,12 +395,14 @@ registered in the index file, or given tree objects.</p>
 </p>\r
 </dd>\r
 <dt>\r
--l | --files-with-matches | -L | --files-without-match\r
+-l | --files-with-matches | --name-only | -L | --files-without-match\r
 </dt>\r
 <dd>\r
 <p>\r
         Instead of showing every matched line, show only the\r
         names of files that contain (or do not contain) matches.\r
+        For better compatability with git-diff, --name-only is a\r
+        synonym for --files-with-matches.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -528,7 +530,7 @@ revamped by Junio C Hamano.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:23 UTC\r
+Last updated 22-Feb-2008 22:56:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.txt b/git-grep.txt
index f3cb24f252e2091d4d2f346b61ce87088fa7b02e..71a73354f8cfa960f641d9563ee8af405b4f881f 100644 (file)
--- 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 95c3d3de1d0e52269f51427b75c46acc42a5b6c8..f8ce82b0228534473180ca4f293712d5cbfe317a 100644 (file)
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -272,7 +272,7 @@ git-merge-index(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-merge-index</em> [-o] [-q] &lt;merge-program&gt; (-a | -- | &lt;file&gt;*)</p>\r
+<p><em>git-merge-index</em> [-o] [-q] &lt;merge-program&gt; (-a | [--] &lt;file&gt;*)</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:31 UTC\r
+Last updated 22-Feb-2008 22:56:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-index.txt b/git-merge-index.txt
index 5d816d0d8b02222517cd4bf320dc3d345fb8d94b..19ee017aede4bf8fa0a0046b2bf347e3d75c4a12 100644 (file)
--- 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
 -----------