From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 05:19:12 +0000 (+0900)
Subject: Merge branch 'mr/doc-negative-pathspec' into maint
X-Git-Tag: v2.15.0-rc2~5^2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8a19eeed795de950714703488c7c8ffb4eb513c2?ds=inline;hp=-c

Merge branch 'mr/doc-negative-pathspec' into maint

Doc updates.

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

8a19eeed795de950714703488c7c8ffb4eb513c2
diff --combined Documentation/git-add.txt
index f4169fb1ec,1c3da6d7dd..b700beaff5
--- a/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 5033483db4,56fb55950a..5edb1da46f
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@@ -161,11 -161,8 +161,11 @@@ OPTION
  
  -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::
@@@ -296,6 -293,9 +296,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
  --------
@@@ -312,6 -312,9 +315,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 d47f198f15,5440711295..9f3a78a36c
--- a/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 b71b943b12,39a6931b9c..6b8888d123
--- a/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