Merge branch 'master' into next
commitf900c6448baad73b29371b7a1b009e8d87d52c2f
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 06:12:22 +0000 (29 23:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 06:12:22 +0000 (29 23:12 -0700)
treed37cf5cc0a00c47f6e689bf39d21e1afcba1fc87
parent050dd3323477dc20614434c5821f1b002abccb4d
parentf2ad051fd120714cbe9dcee5d94942e0105bb0aa
Merge branch 'master' into next

* master:
  send-email: add tests for refactored prompting
  send-email: refactor and ensure prompting doesn't loop forever
  git-svn: fix ls-tree usage with dash-prefixed paths
  import-zips: fix thinko
  git-svn: don't output git commits in quiet mode
  git-svn: fix ls-tree usage with dash-prefixed paths