summaryrefslogtreecommitdiffstats
path: root/git-radar
diff options
context:
space:
mode:
authorMichael Allen <michael@michaelallen.io>2015-10-21 11:54:20 +0100
committerMichael Allen <michael@michaelallen.io>2015-10-21 11:54:20 +0100
commit13110aea3cf060d698a195ab123d912f42114f5f (patch)
treef96f4ac3f6a7bbb835984cab7f9e2651feaeeec2 /git-radar
parent40445543f10f4e10cc13ea8a9e4ba0a79cb200db (diff)
parent934f6fd5b317476e7680bfd07dc2b685b5c37c4d (diff)
downloadgit-sonar-13110aea3cf060d698a195ab123d912f42114f5f.tar.gz
git-sonar-13110aea3cf060d698a195ab123d912f42114f5f.zip
Merge branch 'master' of github.com:michaeldfallen/git-radar into hallzy_#70
Diffstat (limited to 'git-radar')
-rwxr-xr-xgit-radar3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-radar b/git-radar
index 9c8565f..f736e41 100755
--- a/git-radar
+++ b/git-radar
@@ -30,6 +30,7 @@ if [[ -z $@ ]]; then
_conflicted_them="\033[1;33mT\033[0m"
_ahead_master="\xF0\x9D\x98\xAE \033[1;32m←\033[0m"
_local_diverged="\033[1;33m⇵\033[0m"
+ _stash="\033[1;33m≡\033[0m"
echo "git-radar - a heads up display for git"
echo ""
echo "examples:"
@@ -51,6 +52,8 @@ if [[ -z $@ ]]; then
echo " # rebase complete, our rewritten commits now need pushed up"
printf " $_git$_ahead_master 3 $_my_branch$_endgit"
echo " # origin/my-branch is up to date with master and has our 3 commits waiting merge"
+ printf " $_git$_master$_endgit 3$_stash"
+ echo " # You have 3 stashes stored"
echo ""
echo "usage:"