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

diff --cc Documentation/diff-options.txt
Simple merge

diff --cc git-svn.perl
Simple merge

diff --cc t/t0003-attributes.sh
Simple merge