Merge branch 'maint'

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

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 27b9c0f8cc1ff8f7c42c0fdcd86008c7f8d2a5be..a0c9f68580594f785aaec0472ca8404701d4d86d 100644 (file)
--- 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::

diff --git a/git-send-email.perl b/git-send-email.perl
index 404095f258f1eafd8f247257c2416c9dba86364b..eb876f88ddec315991c2634a976eca8e5b99a1ba 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -212,7 +212,7 @@ sub format_2822_time {
 my %parse_alias = (
        # multiline formats can be supported in the future
        mutt => sub { my $fh = shift; while (<$fh>) {
-               if (/^alias\s+(\S+)\s+(.*)$/) {
+               if (/^\s*alias\s+(\S+)\s+(.*)$/) {
                        my ($alias, $addr) = ($1, $2);
                        $addr =~ s/#.*$//; # mutt allows # comments
                         # commas delimit multiple addresses