Merge branch 'rr/prompt-rebase-breakage-fix' into next
commit02957d89c6f24587a01e59f30457e62590bf588c
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2013 18:00:10 +0000 (17 11:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2013 18:00:11 +0000 (17 11:00 -0700)
treed3e9218e464f997ce168f577d4149ba410901784
parente692317381b0c36e9605922c6d51f6e5ad2a4c42
parent2847cae835fa70f00e6e2286fbfa5595cb2247d0
Merge branch 'rr/prompt-rebase-breakage-fix' into next

* rr/prompt-rebase-breakage-fix:
  prompt: squelch error output from cat