mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'mr/doc-negative-pathspec' into maint
Doc updates. * mr/doc-negative-pathspec: docs: improve discoverability of exclude pathspec
This commit is contained in:
commit
8a19eeed79
|
@ -61,6 +61,9 @@ OPTIONS
|
|||
the working tree. Note that older versions of Git used
|
||||
to ignore removed files; use `--no-all` option if you want
|
||||
to add modified or new files but ignore removed ones.
|
||||
+
|
||||
For more details about the <pathspec> syntax, see the 'pathspec' entry
|
||||
in linkgit:gitglossary[7].
|
||||
|
||||
-n::
|
||||
--dry-run::
|
||||
|
|
|
@ -296,6 +296,9 @@ providing this option will cause it to die.
|
|||
<pathspec>...::
|
||||
If given, limit the search to paths matching at least one pattern.
|
||||
Both leading paths match and glob(7) patterns are supported.
|
||||
+
|
||||
For more details about the <pathspec> syntax, see the 'pathspec' entry
|
||||
in linkgit:gitglossary[7].
|
||||
|
||||
Examples
|
||||
--------
|
||||
|
@ -312,6 +315,9 @@ Examples
|
|||
Looks for a line that has `NODE` or `Unexpected` in
|
||||
files that have lines that match both.
|
||||
|
||||
`git grep solution -- :^Documentation`::
|
||||
Looks for `solution`, excluding files in `Documentation`.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
|
|
@ -111,6 +111,8 @@ configuration variable documented in linkgit:git-config[1].
|
|||
without options are equivalent to 'always' and 'never'
|
||||
respectively.
|
||||
|
||||
<pathspec>...::
|
||||
See the 'pathspec' entry in linkgit:gitglossary[7].
|
||||
|
||||
OUTPUT
|
||||
------
|
||||
|
|
|
@ -407,7 +407,7 @@ these forms:
|
|||
|
||||
exclude;;
|
||||
After a path matches any non-exclude pathspec, it will be run
|
||||
through all exclude pathspec (magic signature: `!` or its
|
||||
through all exclude pathspecs (magic signature: `!` or its
|
||||
synonym `^`). If it matches, the path is ignored. When there
|
||||
is no non-exclude pathspec, the exclusion is applied to the
|
||||
result set as if invoked without any pathspec.
|
||||
|
|
|
@ -25,7 +25,7 @@ EOF
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'exclude only no longer errors out' '
|
||||
test_expect_success 'exclude only pathspec uses default implicit pathspec' '
|
||||
git log --oneline --format=%s -- . ":(exclude)sub" >expect &&
|
||||
git log --oneline --format=%s -- ":(exclude)sub" >actual &&
|
||||
test_cmp expect actual
|
||||
|
@ -183,4 +183,15 @@ EOF
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'multiple exclusions' '
|
||||
git ls-files -- ":^*/file2" ":^sub2" >actual &&
|
||||
cat <<-\EOF >expect &&
|
||||
file
|
||||
sub/file
|
||||
sub/sub/file
|
||||
sub/sub/sub/file
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue