Merge branch 'maint'

* maint:
  Document core.excludesfile for git-add
  git-send-email: allow leading white space on mutt aliases
This commit is contained in:
Junio C Hamano
2007-05-17 17:36:57 -07:00
2 changed files with 10 additions and 1 deletions

View File

@ -212,7 +212,7 @@ my $aliasfiletype = $repo->config('sendemail.aliasfiletype');
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