Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
* 'maint' of git://linux-nfs.org/~bfields/git:
user-manual: reorganize public git repo discussion
user-manual: listing commits reachable from some refs not others
user-manual: introduce git
user-manual: add a "counting commits" example
user-manual: move howto/using-topic-branches into manual
user-manual: move howto/make-dist.txt into user manual
Documentation: remove howto's now incorporated into manual
user-manual: move quick-start to an appendix
glossary: expand and clarify some definitions, prune cross-references
user-manual: revise birdseye-view chapter
Add a birdview-on-the-source-code section to the user manual
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 755d718..38c72b8 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -62,6 +62,15 @@
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 11ce395..fde9a72 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -193,12 +193,12 @@
--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 12ced28..e60d877 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -212,7 +212,7 @@
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
