From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Dec 2009 06:47:09 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ff86bdd5cac70850eea4791bea78efa19b228ebe?hp=--cc

Merge branch 'maint'

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

ff86bdd5cac70850eea4791bea78efa19b228ebe