Merge branch 'maint'
commitff86bdd5cac70850eea4791bea78efa19b228ebe
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:47:09 +0000 (8 22:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:47:09 +0000 (8 22:47 -0800)
treee80c89fbffa06c6990886a92112547cf66ca2a07
parentca83dc53916d485e6654c6cce701794dd3a1ed32
parent5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe
Merge branch 'maint'

* maint:
  add-interactive: fix deletion of non-empty files
  pull: clarify advice for the unconfigured error case
git-add--interactive.perl
git-pull.sh