Browse Source

Merge branch 'maint'

* maint:
  Document core.excludesfile for git-add
  git-send-email: allow leading white space on mutt aliases
maint
Junio C Hamano 18 years ago
parent
commit
8299886619
  1. 9
      Documentation/git-add.txt
  2. 2
      git-send-email.perl

9
Documentation/git-add.txt

@ -69,6 +69,15 @@ OPTIONS @@ -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::

2
git-send-email.perl

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

Loading…
Cancel
Save