diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2009-02-20 15:29:18 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2009-02-20 15:29:18 +0100 |
| commit | 545fa99fe715ae62b49bb75492cdae187ac7d2f4 (patch) | |
| tree | fdc217dcb161ec50fd876ebc04ab104d8f5fb80f /01_Functions.zsh | |
| parent | d2d3735f131c9d8cd9611e3a44d4da191e8d6293 (diff) | |
| parent | b8b74c4386808e9ee0ad37441569544fc93a11a0 (diff) | |
Merge branch 'master' of /work/repos/zdotdir
Conflicts:
net:osn.sagem/host:osnp1260077/user:g178241
Diffstat (limited to '01_Functions.zsh')
| -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 f341200..f40a7df 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-)" |