Merge branch 'jk/prompt-fallback-to-tty' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 22:18:00 +0000 (14:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 22:18:00 +0000 (14:18 -0800)
* jk/prompt-fallback-to-tty:
  prompt: fall back to terminal if askpass fails
  prompt: clean up strbuf usage


Trivial merge