Merge branch 'maint'

* maint:
  Update draft release notes for 1.5.3.6
  Fix per-directory exclude handing for "git add"
  core.excludesfile clean-up
  Fix t9101 test failure caused by Subversion "auto-props"
  git-send-email: add charset header if we add encoded 'From'
This commit is contained in:
Junio C Hamano
2007-11-16 21:30:06 -08:00
3 changed files with 64 additions and 5 deletions

View File

@ -48,7 +48,7 @@ EOF
printf "\r\n" > empty_crlf
a_empty_crlf=`git-hash-object -w empty_crlf`
svn import -m 'import for git-svn' . "$svnrepo" >/dev/null
svn import --no-auto-props -m 'import for git-svn' . "$svnrepo" >/dev/null
cd ..
rm -rf import