Merge branch 'jc/combine' into next

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index fbd23944814ca31bf4a875d4db6268e5d68f8a15..d55456ae93f2596717cc2468af066dce8c11f2c6 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -24,13 +24,13 @@ OPTIONS
 
 <option>...::
        Either an option to pass to `grep` or `git-ls-files`.
-
-       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=*`.
-
-       All other options will be passed to `grep`.
++
+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=\*`.
++
+All other options will be passed to `grep`.
 
 <pattern>::
        The pattern to look for.  The first non option is taken