Currently, when performing any operation that saves the state and
expects the user the continue (like rebase, bisect, am), the prompt
screams:
artagnon|completion|REBASE-i 2/2:~/src/git$
Lowercase the words, so we get a more pleasant
artagnon|completion|rebase-i 2/2:~/src/git$
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
contrib/completion/git-prompt.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index eaf5c36..f99d1f2 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -270,29 +270,29 @@ __git_ps1 ()
step=$(cat "$g/rebase-merge/msgnum")
total=$(cat "$g/rebase-merge/end")
if [ -f "$g/rebase-merge/interactive" ]; then
- r="|REBASE-i"
+ r="|rebase-i"
else
- r="|REBASE-m"
+ r="|rebase-m"
fi
else
if [ -d "$g/rebase-apply" ]; then
step=$(cat "$g/rebase-apply/next")
total=$(cat "$g/rebase-apply/last")
if [ -f "$g/rebase-apply/rebasing" ]; then
- r="|REBASE"
+ r="|rebase"
elif [ -f "$g/rebase-apply/applying" ]; then
- r="|AM"
+ r="|am"
else
- r="|AM/REBASE"
+ r="|am/rebase"
fi
elif [ -f "$g/MERGE_HEAD" ]; then
- r="|MERGING"
+ r="|merge"
elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
- r="|CHERRY-PICKING"
+ r="|cherry-pick"
elif [ -f "$g/REVERT_HEAD" ]; then
- r="|REVERTING"
+ r="|revert"
elif [ -f "$g/BISECT_LOG" ]; then
- r="|BISECTING"
+ r="|bisect"
fi
b="$(git symbolic-ref HEAD 2>/dev/null)" || {
--
1.8.3.457.g2410d5e
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html