diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:23 -0700 |
| commit | ab1e76b88c836b16f37083910a4b1844fb4ddaca (patch) | |
| tree | 1c4363d4f2139c0e6d6315bf951d5da92190075f /Documentation | |
| parent | Merge branch 'rs/diff-cleanup-records-fix' (diff) | |
| parent | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude (diff) | |
| download | tgif-ab1e76b88c836b16f37083910a4b1844fb4ddaca.tar.xz | |
Merge branch 'jc/grep-untracked-exclude'
* jc/grep-untracked-exclude:
grep: teach --untracked and --exclude-standard options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-grep.txt | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index e44a4988b7..15d6711d46 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -23,7 +23,7 @@ SYNOPSIS [-A <post-context>] [-B <pre-context>] [-C <context>] [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...] - [--cached | --no-index | <tree>...] + [ [--exclude-standard] [--cached | --no-index | --untracked] | <tree>...] [--] [<pathspec>...] DESCRIPTION @@ -49,7 +49,20 @@ OPTIONS blobs registered in the index file. --no-index:: - Search files in the current directory, not just those tracked by git. + Search files in the current directory that is not managed by git. + +--untracked:: + In addition to searching in the tracked files in the working + tree, search also in untracked files. + +--no-exclude-standard:: + Also search in ignored files by not honoring the `.gitignore` + mechanism. Only useful with `--untracked`. + +--exclude-standard:: + Do not pay attention to ignored files specified via the `.gitignore` + mechanism. Only useful when searching files in the current directory + with `--no-index`. -a:: --text:: |