Merge branch 'maint'

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

diff --combined Documentation/git-add.txt
index 27b9c0f8cc1ff8f7c42c0fdcd86008c7f8d2a5be,38c72b87329720c630419768c9c68cbe718d7a15..a0c9f68580594f785aaec0472ca8404701d4d86d
--- 1/Documentation/git-add.txt
--- 2/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@@ -7,7 -7,7 +7,7 @@@ git-add - Add file contents to the chan
  
  SYNOPSIS
  --------
 -'git-add' [-n] [-v] [-f] [--interactive | -i] [--] <file>...
 +'git-add' [-n] [-v] [-f] [--interactive | -i] [-u] [--] <file>...
  
  DESCRIPTION
  -----------
@@@ -56,19 -56,21 +56,28 @@@ OPTION
        Add modified contents in the working tree interactively to
        the index.
  
 +-u::
 +      Update only files that git already knows about. This is similar
 +      to what "git commit -a" does in preparation for making a commit,
 +      except that the update is limited to paths specified on the
 +      command line. If no paths are specified, all tracked files are
 +      updated.
 +
  \--::
        This option can be used to separate command-line options from
        the list of files, (useful when filenames might be mistaken
        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 --combined git-send-email.perl
index 404095f258f1eafd8f247257c2416c9dba86364b,e60d8777f0a14234c1b695b08e37ae173dd48d26..eb876f88ddec315991c2634a976eca8e5b99a1ba
--- 1/git-send-email.perl
--- 2/git-send-email.perl
+++ b/git-send-email.perl
@@@ -154,8 -154,8 +154,8 @@@ if ($@) 
        $term = new FakeTerm "$@: going non-interactive";
  }
  
 -my $def_chain = $repo->config_boolean('sendemail.chainreplyto');
 -if ($def_chain and $def_chain eq 'false') {
 +my $def_chain = $repo->config_bool('sendemail.chainreplyto');
 +if (defined $def_chain and not $def_chain) {
      $chain_reply_to = 0;
  }
  
@@@ -212,7 -212,7 +212,7 @@@ my $aliasfiletype = $repo->config('send
  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
@@@ -462,13 -462,10 +462,13 @@@ sub send_messag
        }
  
        my $cc = join(", ", unique_email_list(@cc));
 +      my $ccline = "";
 +      if ($cc ne '') {
 +              $ccline = "\nCc: $cc";
 +      }
        $from = sanitize_address_rfc822($from);
        my $header = "From: $from
 -To: $to
 -Cc: $cc
 +To: $to${ccline}
  Subject: $subject
  Date: $date
  Message-Id: $message_id