Code

grep docs: --cached and <tree>... are incompatible
authorMark Lodato <lodatom@gmail.com>
Fri, 26 Feb 2010 03:40:12 +0000 (22:40 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2010 06:39:13 +0000 (22:39 -0800)
In the synopsis for git-grep(1), show that --cached and <tree>... cannot
be used together.

Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-grep.txt

index 2e161306e43582fecd6994f596fa47b796075ddd..37ce94305bdc1b41fef7f24c7e5a274f39df1ba2 100644 (file)
@@ -9,8 +9,7 @@ git-grep - Print lines matching a pattern
 SYNOPSIS
 --------
 [verse]
-'git grep' [--cached]
-          [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]
+'git grep' [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]
           [-v | --invert-match] [-h|-H] [--full-name]
           [-E | --extended-regexp] [-G | --basic-regexp]
           [-F | --fixed-strings] [-n]
@@ -21,7 +20,8 @@ SYNOPSIS
           [--color | --no-color]
           [-A <post-context>] [-B <pre-context>] [-C <context>]
           [-f <file>] [-e] <pattern>
-          [--and|--or|--not|(|)|-e <pattern>...] [<tree>...]
+          [--and|--or|--not|(|)|-e <pattern>...]
+          [--cached | <tree>...]
           [--] [<pathspec>...]
 
 DESCRIPTION