diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-18 15:16:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-18 15:16:43 -0800 |
| commit | c74f97a624f6a79767d2e2d55d98bab5e2b02f16 (patch) | |
| tree | 4a28f82f00c00afba38a89c51452652ffc9a5a7d /Documentation | |
| parent | 8ef7933880e6134f51d7bb5d7566b31ca93ee8c7 (diff) | |
| parent | 4838237cb73a13d38a7e4348b71be96b60eed21e (diff) | |
| download | git-c74f97a624f6a79767d2e2d55d98bab5e2b02f16.tar.gz | |
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.txt | 3 |
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:: |