[PATCH] correct documentation for git grep
Signed-off-by: Matthias Lederhofer <matled@gmx.net>
---
The 'or' as logic or should be marked in the text. I did
that in the patch with --and too so if this is accepted the
documentation should be consistent. Sorry for the noise.
Documentation/git-grep.txt | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 7b810df..ebfe51b 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -16,7 +16,7 @@ SYNOPSIS
[-n] [-l | --files-with-matches] [-L | --files-without-match]
[-c | --count]
[-A <post-context>] [-B <pre-context>] [-C <context>]
- [-f <file>] [-e <pattern>]
+ [-f <file>] [-e] <pattern> [-e <pattern> [..]]
[<tree>...]
[--] [<path>...]
@@ -71,6 +71,12 @@ OPTIONS
-f <file>::
Read patterns from <file>, one per line.
+-e::
+ The next parameter is a pattern. This option has to be
+ used for patterns starting with - and should be used in
+ scripts passing user input to grep. You can specify multiple
+ patterns which will be combined by 'or'.
+
`<tree>...`::
Search blobs in the trees for specified patterns.
--
1.4.1.rc1.g72a4-dirty