Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 26 Oct 2008 23:21:08 +0000 (16:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 26 Oct 2008 23:21:08 +0000 (16:21 -0700)
* maint:
  add -p: warn if only binary changes present
  git-archive: work in bare repos
  git-svn: change dashed git-config to git config

1  2 
archive.c
git-svn.perl

diff --cc archive.c
Simple merge
diff --cc git-svn.perl
Simple merge