Merge branch 'jk/prompt-fallback-to-tty' into next
commitc0c995a78fbceb06b593900d277a1824ad4bb451
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Feb 2012 23:56:27 +0000 (6 15:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Feb 2012 23:56:27 +0000 (6 15:56 -0800)
treee9d37a48a6421bcbed392f912c1f898191990a13
parent0a2142507220d02abfe63794baa947791ae766d1
parent84d72733fc8cb90ac7fef04bb114da1e14d8b147
Merge branch 'jk/prompt-fallback-to-tty' into next

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