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)
commit389e0baa942c4548c5baa60541045b8900113378
tree4ff7c704621c00578ebba46bbda13dd4f9bd8ee3
parenta876433c5fc27cc14860dea3d608ab4e0ff62380
parent995fc2f7e17fab8dd59f31f25870a0823cdb6f27
Merge branch 'jn/maint-pull-rebase-error-message' into maint

* jn/maint-pull-rebase-error-message:
  pull: clarify advice for the unconfigured error case