Merge branch 'rr/prompt-rebase-breakage-fix'
commit352e86e5431509b6834b6d22d139356b6ba6e1b9
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:05 +0000 (23 14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:05 +0000 (23 14:53 -0700)
tree4810a7f80587afd0b4f8aa81a53b77a07b32733e
parent1a22bd31f0a5130ce6c934951a5526ceb774c2be
parent2847cae835fa70f00e6e2286fbfa5595cb2247d0
Merge branch 'rr/prompt-rebase-breakage-fix'

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