Merge branch 'lt/racy-empty'

[git.git] / Documentation / git-grep.txt

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index a97f0557f4aa6cf1d795470d7bbe94ce35abc56a..1b646b73f069e72bc6faa3a058d61ace77c9934c 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -33,25 +33,30 @@ OPTIONS
        Instead of searching in the working tree files, check
        the blobs registered in the index file.
 
        Instead of searching in the working tree files, check
        the blobs registered in the index file.
 

--a | --text::
+-a::
+--text::

        Process binary files as if they were text.
 
        Process binary files as if they were text.
 

--i | --ignore-case::
+-i::
+--ignore-case::

        Ignore case differences between the patterns and the
        files.
 
 -I::
        Don't match the pattern in binary files.
 
        Ignore case differences between the patterns and the
        files.
 
 -I::
        Don't match the pattern in binary files.
 

--w | --word-regexp::
+-w::
+--word-regexp::

        Match the pattern only at word boundary (either begin at the
        beginning of a line, or preceded by a non-word character; end at
        the end of a line or followed by a non-word character).
 
        Match the pattern only at word boundary (either begin at the
        beginning of a line, or preceded by a non-word character; end at
        the end of a line or followed by a non-word character).
 

--v | --invert-match::
+-v::
+--invert-match::

        Select non-matching lines.
 
        Select non-matching lines.
 

--h | -H::
+-h::
+-H::

        By default, the command shows the filename for each
        match.  `-h` option is used to suppress this output.
        `-H` is there for completeness and does not do anything
        By default, the command shows the filename for each
        match.  `-h` option is used to suppress this output.
        `-H` is there for completeness and does not do anything


@@ -64,24 +69,33 @@ OPTIONS
        option forces paths to be output relative to the project
        top directory.
 
        option forces paths to be output relative to the project
        top directory.
 

--E | --extended-regexp | -G | --basic-regexp::
+-E::
+--extended-regexp::
+-G::
+--basic-regexp::

        Use POSIX extended/basic regexp for patterns.  Default
        is to use basic regexp.
 
        Use POSIX extended/basic regexp for patterns.  Default
        is to use basic regexp.
 

--F | --fixed-strings::
+-F::
+--fixed-strings::

        Use fixed strings for patterns (don't interpret pattern
        as a regex).
 
 -n::
        Prefix the line number to matching lines.
 
        Use fixed strings for patterns (don't interpret pattern
        as a regex).
 
 -n::
        Prefix the line number to matching lines.
 

--l | --files-with-matches | --name-only | -L | --files-without-match::
+-l::
+--files-with-matches::
+--name-only::
+-L::
+--files-without-match::

        Instead of showing every matched line, show only the
        names of files that contain (or do not contain) matches.
        For better compatibility with git-diff, --name-only is a
        synonym for --files-with-matches.
 
        Instead of showing every matched line, show only the
        names of files that contain (or do not contain) matches.
        For better compatibility with git-diff, --name-only is a
        synonym for --files-with-matches.
 

--c | --count::
+-c::
+--count::

        Instead of showing every matched line, show the number of
        lines that match.
 
        Instead of showing every matched line, show the number of
        lines that match.
 


@@ -103,7 +117,10 @@ OPTIONS
        scripts passing user input to grep.  Multiple patterns are
        combined by 'or'.
 
        scripts passing user input to grep.  Multiple patterns are
        combined by 'or'.
 

---and | --or | --not | ( | )::
+--and::
+--or::
+--not::
+( ... )::

        Specify how multiple patterns are combined using Boolean
        expressions.  `--or` is the default operator.  `--and` has
        higher precedence than `--or`.  `-e` has to be used for all
        Specify how multiple patterns are combined using Boolean
        expressions.  `--or` is the default operator.  `--and` has
        higher precedence than `--or`.  `-e` has to be used for all


@@ -145,4 +162,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
 
 GIT
 ---

-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite