Merge branch 'maint'
commitfdcb769916c93b53517ef1b4cae447a3333c9b86
authorJunio C Hamano <junkio@cox.net>
Wed, 16 May 2007 19:43:05 +0000 (16 12:43 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 16 May 2007 19:43:05 +0000 (16 12:43 -0700)
tree15900032ae854c16292e8d8e0b5d1f089b5c8263
parent7e431ef9ab933d7ff899a999e40627ab49774f3a
parent0ab564be6e59c66c7aa4fc44997f3fc62ebcd0d9
Merge branch 'maint'

* maint:
  format-patch: add MIME-Version header when we add content-type.
  Fixed link in user-manual
  import-tars: Use the "Link indicator" to identify directories
  git name-rev writes beyond the end of malloc() with large generations
  Documentation/branch: fix small typo in -D example
Documentation/user-manual.txt
commit.c
contrib/fast-import/import-tars.perl
git-compat-util.h