Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'

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