X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-grep.txt;h=d55456ae93f2596717cc2468af066dce8c11f2c6;hb=5edbcd8d778d81254d2c8a4229c76c6fa7880407;hp=5f082167c1b55f1606f0a9ff48db0e03d10faa7b;hpb=0493a3fd5204a36bc961a8611770ddb9ec1ed8ed;p=git.git

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 5f082167..d55456ae 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -1,15 +1,14 @@
 git-grep(1)
 ===========
-v0.99.6, Sep 2005
 
 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
 -----------
@@ -19,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`.