Fixed Symbols for ahead and behind

master
Martin Gondermann 12 years ago
parent 74f9786745
commit 84d86c9b73
  1. 10
      git-prompt-help.sh

@ -12,9 +12,9 @@ hash prefixed with ':'.
TRACKING indicates how the local branch differs from the TRACKING indicates how the local branch differs from the
remote branch. It can be empty, or one of: remote branch. It can be empty, or one of:
${GIT_PROMPT_BRANCH}${GIT_PROMPT_REMOTE}↑N${ResetColor} - ahead of remote by N commits ${GIT_PROMPT_BRANCH}${ResetColor}${GIT_PROMPT_REMOTE}·N${ResetColor} - ahead of remote by N commits
${GIT_PROMPT_BRANCH}${GIT_PROMPT_REMOTE}↓N${ResetColor} - behind remote by N commits ${GIT_PROMPT_BRANCH}${ResetColor}${GIT_PROMPT_REMOTE}·N${ResetColor} - behind remote by N commits
${GIT_PROMPT_BRANCH}${GIT_PROMPT_REMOTE}↓M↑N${ResetColor} - branches diverged, other by M commits, yours by N commits ${GIT_PROMPT_BRANCH}${ResetColor}${GIT_PROMPT_REMOTE}·M↑·N${ResetColor} - branches diverged, other by M commits, yours by N commits
LOCALSTATUS is one of the following: LOCALSTATUS is one of the following:
@ -35,7 +35,7 @@ git_prompt_examples() {
cat <<EOF | sed 's/\\\[\\033//g' | sed 's/\\\]//g' cat <<EOF | sed 's/\\\[\\033//g' | sed 's/\\\]//g'
These are examples of the git prompt: These are examples of the git prompt:
[${GIT_PROMPT_BRANCH}master${GIT_PROMPT_REMOTE}↑3${ResetColor}|${GIT_PROMPT_CHANGED}1${ResetColor}] - on branch "master", ahead of remote by 3 commits, 1 [${GIT_PROMPT_BRANCH}master${ResetColor}${GIT_PROMPT_REMOTE}·3${ResetColor}|${GIT_PROMPT_CHANGED}1${ResetColor}] - on branch "master", ahead of remote by 3 commits, 1
file changed but not staged file changed but not staged
[${GIT_PROMPT_BRANCH}status${ResetColor}|${GIT_PROMPT_STAGED}2${ResetColor}] - on branch "status", 2 files staged [${GIT_PROMPT_BRANCH}status${ResetColor}|${GIT_PROMPT_STAGED}2${ResetColor}] - on branch "status", 2 files staged
@ -46,7 +46,7 @@ These are examples of the git prompt:
[${GIT_PROMPT_BRANCH}master${ResetColor}|${GIT_PROMPT_STASHED}2${ResetColor}] - on branch "master", 2 stash entries [${GIT_PROMPT_BRANCH}master${ResetColor}|${GIT_PROMPT_STASHED}2${ResetColor}] - on branch "master", 2 stash entries
[${GIT_PROMPT_BRANCH}experimental${GIT_PROMPT_REMOTE}↓2↑3${ResetColor}|${GIT_PROMPT_CLEAN}${ResetColor}] [${GIT_PROMPT_BRANCH}experimental${ResetColor}${GIT_PROMPT_REMOTE}·2↑·3${ResetColor}|${GIT_PROMPT_CLEAN}${ResetColor}]
- on branch "experimental"; your branch has diverged - on branch "experimental"; your branch has diverged
by 3 commits, remote by 2 commits; the repository is by 3 commits, remote by 2 commits; the repository is
otherwise clean otherwise clean

Loading…
Cancel
Save