Detect when we are in the middle of a merge, rebase or cherry-pick

joeytwiddle · Apr 4, 2016 · 1c87a4b · 1c87a4b · joeytwiddle · Apr 4, 2016
1 parent 2607539
commit 1c87a4b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/prompt.sh b/prompt.sh
@@ -19,6 +19,14 @@ find_git_branch() {
         #branch=$(git rev-parse HEAD 2> /dev/null)
       fi
     fi
+    local git_dir="$(git rev-parse --show-toplevel)/.git"
+    if [[ -d "$git_dir/rebase-merge" ]]; then
+      branch="$branch>rebase"
+    elif [[ -f "$git_dir/MERGE_HEAD" ]]; then
+      branch="$branch>merge"
+    elif [[ -f "$git_dir/CHERRY_PICK_HEAD" ]]; then
+      branch="$branch>pick"
+    fi
     git_branch=" [$branch]"
   else
     git_branch=""