Merge 1.5.1.5 in

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-mirror · May 19, 2007 · d6b3e3a · d6b3e3a
2 parents 7f79b01 + 6b68342
commit d6b3e3a
Show file tree

Hide file tree

Showing 8 changed files with 1,075 additions and 914 deletions.
diff --git a/Documentation/RelNotes-1.5.1.5.txt b/Documentation/RelNotes-1.5.1.5.txt
@@ -6,6 +6,17 @@ Fixes since v1.5.1.4
 
 * Bugfixes
 
+  - git-send-email did not understand aliases file for mutt, which
+    allows leading whitespaces.
+
+  - git-format-patch emitted Content-Type and Content-Transfer-Encoding
+    headers for non ASCII contents, but failed to add MIME-Version.
+
+  - git-name-rev had a buffer overrun with a deep history.
+
+  - contributed script import-tars did not get the directory in
+    tar archives interpreted correctly.
+
   - git-svn was reported to segfault for many people on list and
     #git; hopefully this has been fixed.
 
@@ -28,10 +39,10 @@ Fixes since v1.5.1.4
     and extern, which caused trouble compiling with Forte12
     compilers on Sun.
 
-  - Many documentation fixes.
+  - Many many documentation fixes and updates.
 
 --
 exec >/var/tmp/1
-O=v1.5.1.4-26-gb4b20b2
+O=v1.5.1.4-48-gcecb98a
 echo O=`git describe refs/heads/maint`
 git shortlog --no-merges $O..refs/heads/maint
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
@@ -207,12 +207,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/Documentation/glossary.txt b/Documentation/glossary.txt
diff --git a/Documentation/howto/dangling-objects.txt b/Documentation/howto/dangling-objects.txt
diff --git a/Documentation/howto/isolate-bugs-with-bisect.txt b/Documentation/howto/isolate-bugs-with-bisect.txt
diff --git a/Documentation/howto/make-dist.txt b/Documentation/howto/make-dist.txt