summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-01-18 15:16:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-18 15:16:43 -0800
commitc74f97a624f6a79767d2e2d55d98bab5e2b02f16 (patch)
tree4a28f82f00c00afba38a89c51452652ffc9a5a7d /Documentation
parentMerge branch 'mh/maint-show-ref-doc' (diff)
parentdiff-index: enable recursive pathspec matching in unpack_trees (diff)
downloadtgif-c74f97a624f6a79767d2e2d55d98bab5e2b02f16.tar.xz
Merge branch 'nd/pathspec-recursion-cleanup'
* nd/pathspec-recursion-cleanup: diff-index: enable recursive pathspec matching in unpack_trees Document limited recursion pathspec matching with wildcards
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-grep.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 15d6711d46..6a8b1e3a7d 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -79,6 +79,9 @@ OPTIONS
--max-depth <depth>::
For each <pathspec> given on command line, descend at most <depth>
levels of directories. A negative value means no limit.
+ This option is ignored if <pathspec> contains active wildcards.
+ In other words if "a*" matches a directory named "a*",
+ "*" is matched literally so --max-depth is still effective.
-w::
--word-regexp::