Merge branch 'jk/prompt-fallback-to-tty' into maint
commitf3f3c4dec6351cb875bdd24e685f2e613eb249c1
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 22:18:00 +0000 (16 14:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 22:18:00 +0000 (16 14:18 -0800)
treee025c24f187d4a68ac367897fbf3d1384c7e6240
parent35c60a08075aa608b2653f9df3685906fe8f634e
parent84d72733fc8cb90ac7fef04bb114da1e14d8b147
Merge branch 'jk/prompt-fallback-to-tty' into maint

* jk/prompt-fallback-to-tty:
  prompt: fall back to terminal if askpass fails
  prompt: clean up strbuf usage