From 5811a6b11f86a2807ebd57697eaa67947276b61d Mon Sep 17 00:00:00 2001
From: Geoff Garside <geoff@geoffgarside.co.uk>
Date: Mon, 31 Aug 2009 14:01:39 +0100
Subject: Strip colours from git.zsh

---
 git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git.zsh')

diff --git a/git.zsh b/git.zsh
index b9a86173f..7f5714f74 100644
--- a/git.zsh
+++ b/git.zsh
@@ -4,7 +4,7 @@ function git_prompt_info() {
   branch=${ref#refs/heads/}
 
   if [[ -d .git ]]; then
-    CURRENT_BRANCH="%{$fg[red]%}git:(%{$fg[green]${branch}%{$fg[red])"
+    CURRENT_BRANCH="(${branch})"
   else
     CURRENT_BRANCH=''
   fi
-- 
cgit v1.2.3-70-g09d2


From a9c18304621b045d90a2fc328da79f29a2de6b42 Mon Sep 17 00:00:00 2001
From: Geoff Garside <geoff@geoffgarside.co.uk>
Date: Mon, 31 Aug 2009 21:23:35 +0100
Subject: Change dirty git string to a yello X

---
 git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git.zsh')

diff --git a/git.zsh b/git.zsh
index 7f5714f74..85279265e 100644
--- a/git.zsh
+++ b/git.zsh
@@ -13,5 +13,5 @@ function git_prompt_info() {
 }
 
 parse_git_dirty () {
-  [[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "%{$fg[white] ♻ "
+  [[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "%{$fg[yellow]%}✗%{$reset_color%}"
 }
-- 
cgit v1.2.3-70-g09d2


From 652caa6b2591e773179b8e38992d516db1f99930 Mon Sep 17 00:00:00 2001
From: Geoff Garside <geoff@geoffgarside.co.uk>
Date: Mon, 31 Aug 2009 21:23:59 +0100
Subject: Colour branch name and add dirty string

---
 git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git.zsh')

diff --git a/git.zsh b/git.zsh
index 85279265e..805969b71 100644
--- a/git.zsh
+++ b/git.zsh
@@ -4,7 +4,7 @@ function git_prompt_info() {
   branch=${ref#refs/heads/}
 
   if [[ -d .git ]]; then
-    CURRENT_BRANCH="(${branch})"
+    CURRENT_BRANCH="(%{$fg[red]%}${branch}%{$reset_color%}) $(parse_git_dirty) "
   else
     CURRENT_BRANCH=''
   fi
-- 
cgit v1.2.3-70-g09d2


From 845eabc8cc86ebfcab7a9ebca5eb87aa136e9ce3 Mon Sep 17 00:00:00 2001
From: Geoff Garside <geoff@geoffgarside.co.uk>
Date: Mon, 31 Aug 2009 21:51:11 +0100
Subject: Restructure spaces in git pieces

---
 git.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'git.zsh')

diff --git a/git.zsh b/git.zsh
index 805969b71..a8e2e36aa 100644
--- a/git.zsh
+++ b/git.zsh
@@ -4,7 +4,7 @@ function git_prompt_info() {
   branch=${ref#refs/heads/}
 
   if [[ -d .git ]]; then
-    CURRENT_BRANCH="(%{$fg[red]%}${branch}%{$reset_color%}) $(parse_git_dirty) "
+    CURRENT_BRANCH="(%{$fg[red]%}${branch}%{$reset_color%})$(parse_git_dirty) "
   else
     CURRENT_BRANCH=''
   fi
@@ -13,5 +13,5 @@ function git_prompt_info() {
 }
 
 parse_git_dirty () {
-  [[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "%{$fg[yellow]%}✗%{$reset_color%}"
+  [[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]] && echo " %{$fg[yellow]%}✗%{$reset_color%}"
 }
-- 
cgit v1.2.3-70-g09d2


From af8294d2068e3614a7635486de1d89e12e23a8e5 Mon Sep 17 00:00:00 2001
From: Geoff Garside <geoff@geoffgarside.co.uk>
Date: Mon, 31 Aug 2009 22:24:03 +0100
Subject: Move the spaces around again :P

---
 git.zsh                       | 2 +-
 themes/geoffgarside.zsh-theme | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'git.zsh')

diff --git a/git.zsh b/git.zsh
index a8e2e36aa..1b458762d 100644
--- a/git.zsh
+++ b/git.zsh
@@ -4,7 +4,7 @@ function git_prompt_info() {
   branch=${ref#refs/heads/}
 
   if [[ -d .git ]]; then
-    CURRENT_BRANCH="(%{$fg[red]%}${branch}%{$reset_color%})$(parse_git_dirty) "
+    CURRENT_BRANCH="(%{$fg[red]%}${branch}%{$reset_color%})$(parse_git_dirty)"
   else
     CURRENT_BRANCH=''
   fi
diff --git a/themes/geoffgarside.zsh-theme b/themes/geoffgarside.zsh-theme
index 5c37ffc3e..38733d95c 100644
--- a/themes/geoffgarside.zsh-theme
+++ b/themes/geoffgarside.zsh-theme
@@ -1,2 +1,2 @@
 # PROMPT="[%*] %n:%c $(git_prompt_info)%(!.#.$) "
-PROMPT='[%*] %{$fg[cyan]%}%n%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%} $(git_prompt_info)%(!.#.$) '
+PROMPT='[%*] %{$fg[cyan]%}%n%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
-- 
cgit v1.2.3-70-g09d2