add merge.renamelimit config option

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index f3cb24f252e2091d4d2f346b61ce87088fa7b02e..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.
 
--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 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