From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Subject: [PATCH 1/6] prompt: don't scream continuation state
Date: Sun, 2 Jun 2013 19:33:37 +0530 [thread overview]
Message-ID: <1370181822-23450-2-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1370181822-23450-1-git-send-email-artagnon@gmail.com>
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@gmail.com>
---
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
next prev parent reply other threads:[~2013-06-02 14:06 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-02 14:03 [PATCH 0/6] Minor prompt, completion cleanups Ramkumar Ramachandra
2013-06-02 14:03 ` Ramkumar Ramachandra [this message]
2013-06-03 8:58 ` [PATCH 1/6] prompt: don't scream continuation state Thomas Rast
2013-06-03 9:47 ` Ramkumar Ramachandra
2013-06-03 21:15 ` Jeff King
2013-06-04 3:44 ` Ramkumar Ramachandra
2013-06-04 4:38 ` Jeff King
2013-06-04 5:59 ` Junio C Hamano
2013-06-03 17:23 ` Junio C Hamano
2013-06-02 14:03 ` [PATCH 2/6] completion: add common options for rev-parse Ramkumar Ramachandra
2013-06-07 15:33 ` Ramkumar Ramachandra
2013-06-02 14:03 ` [PATCH 3/6] completion: add common options for blame Ramkumar Ramachandra
2013-06-03 9:03 ` Thomas Rast
2013-06-03 9:32 ` Ramkumar Ramachandra
2013-06-03 18:07 ` SZEDER Gábor
2013-06-03 18:34 ` Junio C Hamano
2013-06-06 9:58 ` Peter Krefting
2013-06-03 17:24 ` Junio C Hamano
2013-06-02 14:03 ` [PATCH 4/6] completion: correct completion for format-patch Ramkumar Ramachandra
2013-06-02 17:20 ` Felipe Contreras
2013-06-02 17:29 ` Ramkumar Ramachandra
2013-06-02 14:03 ` [PATCH 5/6] completion: clarify difftool completion Ramkumar Ramachandra
2013-06-03 17:29 ` Junio C Hamano
2013-06-02 14:03 ` [PATCH 6/6] completion: clarify ls-tree, archive, show completion Ramkumar Ramachandra
2013-06-03 17:33 ` Junio C Hamano
2013-06-04 3:49 ` Ramkumar Ramachandra
2013-06-04 6:01 ` Junio C Hamano
2013-06-03 17:58 ` Junio C Hamano
2013-06-03 19:25 ` SZEDER Gábor
2013-06-07 17:21 ` Ramkumar Ramachandra
2013-06-07 18:36 ` Junio C Hamano
2013-06-07 18:45 ` SZEDER Gábor
2013-06-09 20:56 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1370181822-23450-2-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).