diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-17 17:36:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-17 17:36:57 -0700 |
| commit | 8299886619b8dab99773b5810f50c63a50b2d611 (patch) | |
| tree | 22d82b20368b9483535861610fb64b07d038a892 | |
| parent | 5f85505265601823cc228fdc94d67d3b0ba582e4 (diff) | |
| parent | 164b19893ab5bc66b531a26480149a0dff082969 (diff) | |
| download | git-8299886619b8dab99773b5810f50c63a50b2d611.tar.gz git-8299886619b8dab99773b5810f50c63a50b2d611.tar.xz | |
Merge branch 'maint'
* maint:
Document core.excludesfile for git-add
git-send-email: allow leading white space on mutt aliases
| -rw-r--r-- | Documentation/git-add.txt | 9 | ||||
| -rwxr-xr-x | git-send-email.perl | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 27b9c0f8c..a0c9f6858 100644 --- 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 404095f25..eb876f88d 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 |