From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Apr 2008 06:37:06 +0000 (-0700)
Subject: Merge branch 'maint-1.5.4' into maint
X-Git-Tag: v1.5.5.2~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d6958a1a32814af69a7571daa45252018c61f969;p=git.git

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  svn-git: Use binmode for reading/writing binary rev maps
  diff options documentation: refer to --diff-filter in --name-status
  git-svn bug with blank commits and author file
  archive.c: format_subst - fixed bogus argument to memchr
  copy.c: copy_fd - correctly report write errors
  gitattributes: Fix subdirectory attributes specified from root directory
---

d6958a1a32814af69a7571daa45252018c61f969