Merge branch 'rr/zsh-color-prompt' into next
commitd011a764ad6f3f2f027d0f7fe631a0c561a6a379
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 20:14:33 +0000 (3 13:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 20:14:33 +0000 (3 13:14 -0700)
tree389c3b6d35870965534f889a777487d2dd764bc4
parent14329fa7e1551d61dc0d5f8faea5390fbb1d5cd3
parent9678696c4ad0d269f933de001daa78c54a2b8868
Merge branch 'rr/zsh-color-prompt' into next

* rr/zsh-color-prompt:
  prompt: colorize ZSH prompt
  prompt: factor out gitstring coloring logic
  prompt: introduce GIT_PS1_STATESEPARATOR