Merge branch 'jn/maint-pull-rebase-error-message' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:39:20 +0000 (22:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:39:20 +0000 (22:39 -0800)
* jn/maint-pull-rebase-error-message:
  pull: clarify advice for the unconfigured error case


Trivial merge