diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2009-02-17 16:18:03 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2009-02-17 16:18:03 +0100 |
| commit | 50c6677fee4a70e5cfb2200755d5c359054d5b2d (patch) | |
| tree | 1756944b569a3d59a3ed1d4613aabded995cdf3c | |
| parent | 1088c07251e3dab900a27c265334e8d3739f29a3 (diff) | |
[FUNCS] rebase git for versions >= 1.5.?.?
| -rw-r--r-- | 01_Functions.zsh | 1 |
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-)" |