Merge branch 'mr/doc-negative-pathspec'

Doc updates.

* mr/doc-negative-pathspec:
docs: improve discoverability of exclude pathspec

diff --combined Documentation/git-add.txt
index f4169fb1ec4c61068cc70756c31a5abcc31496f6,1c3da6d7ddb632b33ce1c4118dec161e816ce7a9..b700beaff5ad2eaa407bfb3818e016a5bb27d87c
--- 1/Documentation/git-add.txt
--- 2/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@@ -61,6 -61,9 +61,9 @@@ OPTION
        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::
@@@ -165,13 -168,6 +168,13 @@@ for "git add --no-all <pathspec>...", i
        be ignored, no matter if they are already present in the work
        tree or not.
  
 +--no-warn-embedded-repo::
 +      By default, `git add` will warn when adding an embedded
 +      repository to the index without using `git submodule add` to
 +      create an entry in `.gitmodules`. This option will suppress the
 +      warning (e.g., if you are manually performing operations on
 +      submodules).
 +
  --chmod=(+|-)x::
        Override the executable bit of the added files.  The executable
        bit is only changed in the index, the files on disk are left

diff --combined Documentation/git-grep.txt
index 720c7850e2790bf18a3c493977a2703cbeab048a,56fb55950af3577a0f0df88fc7dcd62e581b6155..18b494731f51145e9d4a4d078264bedfd3beb00f
--- 1/Documentation/git-grep.txt
--- 2/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@@ -95,6 -95,13 +95,6 @@@ OPTION
        <tree> option the prefix of all submodule output will be the name of
        the parent project's <tree> object.
  
 ---parent-basename <basename>::
 -      For internal use only.  In order to produce uniform output with the
 -      --recurse-submodules option, this option can be used to provide the
 -      basename of a parent's <tree> object to a submodule so the submodule
 -      can prefix its output with the parent's name rather than the SHA1 of
 -      the submodule.
 -
  -a::
  --text::
        Process binary files as if they were text.
@@@ -154,11 -161,8 +154,11 @@@
  
  -P::
  --perl-regexp::
 -      Use Perl-compatible regexp for patterns. Requires libpcre to be
 -      compiled in.
 +      Use Perl-compatible regular expressions for patterns.
 ++
 +Support for these types of regular expressions is an optional
 +compile-time dependency. If Git wasn't compiled with support for them
 +providing this option will cause it to die.
  
  -F::
  --fixed-strings::
@@@ -289,6 -293,9 +289,9 @@@
  <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
  --------
@@@ -305,6 -312,9 +308,9 @@@
        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 --combined Documentation/git-status.txt
index d47f198f15cd4c767b03c14580b816bf750e9ee1,54407112956b9d829b57eeb550e6cd2c63e385d8..9f3a78a36c48c55318ee0eea8e96a64ccce5bfa2
--- 1/Documentation/git-status.txt
--- 2/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@@ -32,9 -32,6 +32,9 @@@ OPTION
  --branch::
        Show the branch and tracking info even in short-format.
  
 +--show-stash::
 +      Show the number of entries currently stashed away.
 +
  --porcelain[=<version>]::
        Give the output in an easy-to-parse format for scripts.
        This is similar to the short output, but will remain stable
@@@ -111,6 -108,8 +111,8 @@@ configuration variable documented in li
        without options are equivalent to 'always' and 'never'
        respectively.
  
+ <pathspec>...::
+       See the 'pathspec' entry in linkgit:gitglossary[7].
  
  OUTPUT
  ------

diff --combined Documentation/glossary-content.txt
index b71b943b12eda2eab1792dfc910e405ad2ad540c,39a6931b9c0e56c1ddc6bef71a4df73cc0606153..6b8888d123826179ace38660f5043d897eb5ce70
--- 1/Documentation/glossary-content.txt
--- 2/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@@ -407,7 -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.
@@@ -570,10 -570,6 +570,10 @@@ The most notable example is `HEAD`
        is created by giving the `--depth` option to linkgit:git-clone[1], and
        its history can be later deepened with linkgit:git-fetch[1].
  
 +[[def_stash]]stash entry::
 +      An <<def_object,object>> used to temporarily store the contents of a
 +      <<def_dirty,dirty>> working directory and the index for future reuse.
 +
  [[def_submodule]]submodule::
        A <<def_repository,repository>> that holds the history of a
        separate project inside another repository (the latter of