One minor change, in accordance with Junio's review. In part 1, I use: local z="${GIT_PS1_STATESEPARATOR-" "}" Instead of the convoluted: local z=" " if [ -n "${GIT_PS1_STATESEPARATOR+set}" ]; then z="${GIT_PS1_STATESEPARATOR}" fi Everything else is the same. I've rebased it on top of the latest `master`. Ramkumar Ramachandra (3): prompt: introduce GIT_PS1_STATESEPARATOR prompt: factor out gitstring coloring logic prompt: colorize ZSH prompt contrib/completion/git-prompt.sh | 124 +++++++++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 39 deletions(-) -- 1.8.1.2.432.g070c57d -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html