diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:19:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:19:12 (GMT) |
| commit | 8a19eeed795de950714703488c7c8ffb4eb513c2 (patch) | |
| tree | 397f9de7a19925a3701af7a97d4b7711f7ab4aec /Documentation | |
| parent | 41052b11bc5a128c6a4266ea60c712a088cb2166 (diff) | |
| parent | 93dbefb389a011c9107a3908fd38e743055be267 (diff) | |
| download | git-8a19eeed795de950714703488c7c8ffb4eb513c2.zip git-8a19eeed795de950714703488c7c8ffb4eb513c2.tar.gz git-8a19eeed795de950714703488c7c8ffb4eb513c2.tar.bz2 | |
Merge branch 'mr/doc-negative-pathspec' into maint
Doc updates.
* mr/doc-negative-pathspec:
docs: improve discoverability of exclude pathspec
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-add.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-grep.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-status.txt | 2 | ||||
| -rw-r--r-- | Documentation/glossary-content.txt | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index f4169fb..b700bea 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -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:: diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 5033483..5edb1da 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -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 diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index d47f198..9f3a78a 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -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 ------ diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index b71b943..6b8888d 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -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. |