Skip to content
Browse files

Add function to display if there is a rebase, merge or bisect going o…

…n on the prompt
  • Loading branch information...
1 parent 7a41498 commit 600975cec72311c7279f20e09cdb8d78ed81526e Mario Fernandez committed Jan 17, 2012
Showing with 19 additions and 0 deletions.
  1. +19 −0 lib/git.zsh
View
19 lib/git.zsh
@@ -62,3 +62,22 @@ git_prompt_status() {
fi
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
+}

0 comments on commit 600975c

Please sign in to comment.
Something went wrong with that request. Please try again.