Merge branch 'maint-1.5.4' into maint

[git.git] / Documentation / git-grep.txt

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 97faaa1d3a9d8c7025ab33c3126ba10e4c5ed708..a97f0557f4aa6cf1d795470d7bbe94ce35abc56a 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -75,9 +75,11 @@ OPTIONS
 -n::
        Prefix the line number to matching lines.
 
 -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.
        Instead of showing every matched line, show only the
        names of files that contain (or do not contain) matches.

+       For better compatibility with git-diff, --name-only is a
+       synonym for --files-with-matches.

 
 -c | --count::
        Instead of showing every matched line, show the number of
 
 -c | --count::
        Instead of showing every matched line, show the number of


@@ -143,4 +145,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
 
 GIT
 ---

-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite