Merge branch 'maint'
commit39231b1c32caee10c7ac3397341ea0c6cf56e7f9
authorJunio C Hamano <junkio@cox.net>
Sun, 29 Apr 2007 08:52:43 +0000 (29 01:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 29 Apr 2007 08:52:43 +0000 (29 01:52 -0700)
tree5e51fb9d639bf6b6b99ae5d01286360b7303f2f1
parent4342572600f446b9f8db553df03d458229f944dd
parente9d54bd18bcf5dc9eb68eb1cba9a6a7ba3f71fd6
Merge branch 'maint'

* maint:
  http.c: Fix problem with repeated calls of http_init
  Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
  Fix import-tars fix.
  Update .mailmap with "Michael"
  Do not barf on too long action description
  Catch empty pathnames in trees during fsck
  Don't allow empty pathnames in fast-import
  import-tars: be nice to wrong directory modes
  git-svn: Added 'find-rev' command
  git shortlog documentation: add long options and fix a typo
Documentation/git.txt
builtin-fetch--tool.c
builtin-fsck.c
contrib/fast-import/import-tars.perl
fast-import.c