summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Mark Lodato <lodatom@gmail.com>2010-02-25 22:40:12 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-25 22:39:13 -0800
commitec2537beda63f78746f8b43a031120be0d32310e (patch)
tree7c77e7be834412f0f1dcd9fc4ed31101cfb393d3
parentgrep docs: use AsciiDoc literals consistently (diff)
downloadtgif-ec2537beda63f78746f8b43a031120be0d32310e.tar.xz
grep docs: --cached and <tree>... are incompatible
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>
-rw-r--r--Documentation/git-grep.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 2e161306e4..37ce94305b 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -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