Merge branch 'maint'

* maint:
  add -p: warn if only binary changes present
  git-archive: work in bare repos
  git-svn: change dashed git-config to git config

diff --cc archive.c
Simple merge

diff --cc git-svn.perl
Simple merge