summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--01_Functions.zsh1
1 files changed, 1 insertions, 0 deletions
diff --git a/01_Functions.zsh b/01_Functions.zsh
index 842e4d6..f5f64e3 100644
--- a/01_Functions.zsh
+++ b/01_Functions.zsh
@@ -81,6 +81,7 @@ get_git_branch ()
# Rebase in progress ?
REBASE="";
[ -e $(git-rev-parse --git-dir)/../.dotest/rebasing ] && REBASE="rebase:"
+ [ -d $(git-rev-parse --git-dir)/rebase-merge ] && REBASE="rebase:"
# Get current working GIT branch
my_git_branch="$REBASE$(git-branch 2>&- | grep -E '^\* ' | cut -c3-)"