From 504ceab6d24bc19ed5a04b5978c8899fa58dffe1 Mon Sep 17 00:00:00 2001 From: Michael Hendricks Date: Wed, 16 May 2007 23:15:16 -0600 Subject: [PATCH 1/2] git-send-email: allow leading white space on mutt aliases mutt version 1.5.14 (perhaps earlier versions too) permits alias files to have white space before the 'alias' keyword. Signed-off-by: Michael Hendricks Signed-off-by: Junio C Hamano --- git-send-email.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-send-email.perl b/git-send-email.perl index 12ced28885..e60d8777f0 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -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 From 164b19893ab5bc66b531a26480149a0dff082969 Mon Sep 17 00:00:00 2001 From: Michael Hendricks Date: Wed, 16 May 2007 23:08:50 -0600 Subject: [PATCH 2/2] Document core.excludesfile for git-add During the discussion of core.excludesfile in the user-manual, I realized that the configuration wasn't mentioned in the man pages. Signed-off-by: Michael Hendricks Signed-off-by: Junio C Hamano --- Documentation/git-add.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 755d7186f5..38c72b8732 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -62,6 +62,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::