git-rev-list: add documentation for --parents, --no-merges

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 56b683ae56ac65f11932f5cf74bafb7ede800f92..62a8e7f222d480046beee5cf735fa92821e26f8d 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -12,11 +12,11 @@ SYNOPSIS
 'git-grep' [--cached]
           [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]
           [-v | --invert-match]
-          [-E | --extended-regexp]  [-G | --basic-regexp]
+          [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings]
           [-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>
           [<tree>...]
           [--] [<path>...]
 
@@ -30,7 +30,7 @@ OPTIONS
 -------
 --cached::
        Instead of searching in the working tree files, check
-       the blobs registerd in the index file.
+       the blobs registered in the index file.
 
 -a | --text::
        Process binary files as if they were text.
@@ -65,12 +65,17 @@ OPTIONS
 -[ABC] <context>::
        Show `context` trailing (`A` -- after), or leading (`B`
        -- before), or both (`C` -- context) lines, and place a
-       line containing `--` between continguous groups of
+       line containing `--` between contiguous groups of
        matches.
 
 -f <file>::
        Read patterns from <file>, one per line.
 
+-e::
+       The next parameter is the pattern. This option has to be
+       used for patterns starting with - and should be used in
+       scripts passing user input to grep.
+
 `<tree>...`::
        Search blobs in the trees for specified patterns.