undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ml/maint-grep-doc'

Browse Source 
* ml/maint-grep-doc:
  grep documentation: clarify what files match
This commit is contained in:
Junio C Hamano 2010-02-21 12:01:06 -08:00
commit 241b9254e1
1 changed files with 12 additions and 5 deletions

17
Documentation/git-grep.txt
View File

@ -22,12 +22,12 @@ SYNOPSIS
[-A <post-context>] [-B <pre-context>] [-C <context>] [-A <post-context>] [-B <pre-context>] [-C <context>]
[-f <file>] [-e] <pattern> [-f <file>] [-e] <pattern>
[--and|--or|--not|(|)|-e <pattern>...] [<tree>...] [--and|--or|--not|(|)|-e <pattern>...] [<tree>...]
[--] [<path>...] [--] [<pathspec>...]
DESCRIPTION DESCRIPTION
----------- -----------
Look for specified patterns in the working tree files, blobs Look for specified patterns in the tracked files in the work tree, blobs
registered in the index file, or given tree objects. registered in the index file, or blobs in given tree objects.
OPTIONS OPTIONS
@ -49,7 +49,7 @@ OPTIONS
Don't match the pattern in binary files. Don't match the pattern in binary files.
--max-depth <depth>:: --max-depth <depth>::
For each pathspec given on command line, descend at most <depth> For each <pathspec> given on command line, descend at most <depth>
levels of directories. A negative value means no limit. levels of directories. A negative value means no limit.
-w:: -w::
@ -168,12 +168,19 @@ OPTIONS
\--:: \--::
Signals the end of options; the rest of the parameters Signals the end of options; the rest of the parameters
are <path> limiters. are <pathspec> limiters.
<pathspec>...::
If given, limit the search to paths matching at least one pattern.
Both leading paths match and glob(7) patterns are supported.
Example Example
------- -------
git grep 'time_t' -- '*.[ch]'::
Looks for `time_t` in all tracked .c and .h files in the working
directory and its subdirectories.
git grep -e \'#define\' --and \( -e MAX_PATH -e PATH_MAX \):: git grep -e \'#define\' --and \( -e MAX_PATH -e PATH_MAX \)::
Looks for a line that has `#define` and either `MAX_PATH` or Looks for a line that has `#define` and either `MAX_PATH` or
`PATH_MAX`. `PATH_MAX`.