Merge branch 'maint'

* maint:
  Document core.excludesfile for git-add
  git-send-email: allow leading white space on mutt aliases

1 files changed, 9 insertions, 0 deletions

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 27b9c0f8cc..a0c9f68580 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -69,6 +69,15 @@ OPTIONS
 	for command-line options).
 
 
+Configuration
+-------------
+
+The optional configuration variable 'core.excludesfile' indicates a path to a
+file containing patterns of file names to exclude from git-add, similar to
+$GIT_DIR/info/exclude.  Patterns in the exclude file are used in addition to
+those in info/exclude.  See link:repository-layout.html[repository layout].
+
+
 EXAMPLES
 --------
 git-add Documentation/\\*.txt::