Merge branch 'master' into jc/diff

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 017579348319477c6356fcfce309ce68746d6899..d55456ae93f2596717cc2468af066dce8c11f2c6 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -3,12 +3,12 @@ git-grep(1)
 
 NAME
 ----
-git-grep - print lines matching a pattern
+git-grep - Print lines matching a pattern
 
 
 SYNOPSIS
 --------
-'git-grep' <option>... <pattern> <path>...
+'git-grep' [<option>...] [-e] <pattern> [--] [<path>...]
 
 DESCRIPTION
 -----------
@@ -18,16 +18,26 @@ containing a match to the given pattern.
 
 OPTIONS
 -------
+`--`::
+       Signals the end of options; the rest of the parameters
+       are <path> limiters.
+
 <option>...::
        Either an option to pass to `grep` or `git-ls-files`.
-       Some `grep` options, such as `-C` and `-m`, that take
-       parameters are known to `git-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 pattern to look for.  The first non option is taken
+       as the pattern; if your pattern begins with a dash, use
+       `-e <pattern>`.
 
 <path>...::
-
        Optional paths to limit the set of files to be searched;
        passed to `git-ls-files`.