summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-04 18:40:41 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-04 18:40:41 -0700
commitdbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c (patch)
treed3f094e8c3d559f6efdeca927b613c8535cb7699 /Documentation
parent703f05ad5835cff92b12c29aecf8d724c8c847e2 (diff)
parent0a93fb8a9cc6fa1bf7dba6b498cba3f57f5017a1 (diff)
downloadgit-dbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c.tar.gz
Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
* jc/maint-grep-untracked-exclude: grep: teach --untracked and --exclude-standard options grep --no-index: don't use git standard exclusions grep: do not use --index in the short usage output Conflicts: Documentation/git-grep.txt builtin/grep.c
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-grep.txt17
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::