linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e2146d0562 into 533e31f2cc

Browse source
This commit is contained in:
Stibbons 2013-12-02 23:34:51 -08:00
commit 4590e7e33a
2 changed files with 44 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/git.zsh
View file

@ -116,6 +116,25 @@ git_prompt_status() {
echo $STATUS
}
# Checks if there is a bisect, merge or rebase currently going on
git_prompt_rebase_state() {
STATUS=""
if [ -f ".git/BISECT_LOG" ] ; then
STATUS="$ZSH_THEME_GIT_PROMPT_STATE_BEFORE$ZSH_THEME_GIT_PROMPT_STATE_BISECT"
elif [ -f ".git/MERGE_HEAD" ] ; then
STATUS="$ZSH_THEME_GIT_PROMPT_STATE_BEFORE$ZSH_THEME_GIT_PROMPT_STATE_MERGE"
else
for dir in rebase rebase-apply rebase-merge ; do
if [ -d ".git/$dir" ] ; then
STATUS="$ZSH_THEME_GIT_PROMPT_STATE_BEFORE$ZSH_THEME_GIT_PROMPT_STATE_REBASE"
break
fi
done
fi
echo $STATUS
}
#compare the provided version of git to the version installed and on path
#prints 1 if input version <= installed version
#prints -1 otherwise