From 50c6677fee4a70e5cfb2200755d5c359054d5b2d Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Tue, 17 Feb 2009 16:18:03 +0100
Subject: [FUNCS] rebase git for versions >= 1.5.?.?

---
 01_Functions.zsh | 1 +
 1 file changed, 1 insertion(+)

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-)"
-- 
cgit v1.2.3