diff options
| -rw-r--r-- | Documentation/git-add.txt | 9 | ||||
| -rw-r--r-- | Documentation/git-rev-list.txt | 4 | ||||
| -rwxr-xr-x | git-send-email.perl | 2 |
3 files changed, 12 insertions, 3 deletions
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:: diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 11ce395c98..fde9a7208d 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -193,12 +193,12 @@ limiting may be applied. --author='pattern', --committer='pattern':: Limit the commits output to ones with author/committer - header lines that match the specified pattern. + header lines that match the specified pattern (regular expression). --grep='pattern':: Limit the commits output to ones with log message that - matches the specified pattern. + matches the specified pattern (regular expression). --remove-empty:: 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 |