From: Junio C Hamano <junkio@cox.net>
Date: Sun, 29 Apr 2007 08:52:43 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc1~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=39231b1c32caee10c7ac3397341ea0c6cf56e7f9;p=git.git

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
---

39231b1c32caee10c7ac3397341ea0c6cf56e7f9