summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Eduardo R. D'Avila <erdavila@gmail.com>2013-06-26 00:05:17 -0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-26 13:03:01 -0700
commitcf4cac4cfc13326920bdbf3d51236e2065f5ba2f (patch)
tree0480748d01ff64b82f67e515e9b055b029103b89 /builtin/merge-file.c
parentgit-prompt.sh: do not print duplicate clean color code (diff)
downloadtgif-cf4cac4cfc13326920bdbf3d51236e2065f5ba2f.tar.xz
git-prompt.sh: add missing information in comments
Mention that the command below is needed for prompt in ZSH with PS1: setopt PROMPT_SUBST Rephrase some parts that mention only the "current branch name" being displayed in the prompt. Replace it by stating that the "repository status" is displayed. Make it clear that colored prompt is only available in PROMPT_COMMAND/precmd mode. With-suggestions-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Eduardo R. D'Avila <erdavila@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions