From 3e5e2d45e95f0ee523ce2572a5e88f6e761e7067 Mon Sep 17 00:00:00 2001
From: Daniele <raiervol@gmail.com>
Date: Tue, 31 Dec 2013 12:41:28 +0100
Subject: [PATCH 1/4] Fix bad right prompt placing.

---
 themes/af-magic.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 4cf282590..f241efb6a 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
+RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"

From 827d9dfcb406c5d25470010933fc6fde85a7ded7 Mon Sep 17 00:00:00 2001
From: Sam O <soluwalana@gmail.com>
Date: Thu, 2 Jan 2014 15:48:09 -0800
Subject: [PATCH 2/4] Update git.plugin.zsh

---
 plugins/git/git.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fde22a37d..42b4698f9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -142,13 +142,13 @@ compdef _git glp=git-log
 #
 # This function return a warning if the current branch is a wip
 function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c wip); then
+  if $(git log -n 1 2>/dev/null | grep -q -c "--wip--"); then
     echo "WIP!!"
   fi
 }
 # these alias commit and uncomit wip branches
-alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "wip"'
-alias gunwip='git log -n 1 | grep -q -c wip && git reset HEAD~1'
+alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"'
+alias gunwip='git log -n 1 | grep -q -c "--wip--" && git reset HEAD~1'
 
 # these alias ignore changes to file
 alias gignore='git update-index --assume-unchanged'

From d60522c7a290565c9de7594817a9d201732d5dd9 Mon Sep 17 00:00:00 2001
From: Sam O <soluwalana@gmail.com>
Date: Thu, 2 Jan 2014 15:53:34 -0800
Subject: [PATCH 3/4] escape dashes

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 42b4698f9..1285a3247 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -142,13 +142,13 @@ compdef _git glp=git-log
 #
 # This function return a warning if the current branch is a wip
 function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c "--wip--"); then
+  if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
     echo "WIP!!"
   fi
 }
 # these alias commit and uncomit wip branches
 alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"'
-alias gunwip='git log -n 1 | grep -q -c "--wip--" && git reset HEAD~1'
+alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 
 # these alias ignore changes to file
 alias gignore='git update-index --assume-unchanged'

From 4354f911710572f9ec0a8e4435571ea3c19cb0f8 Mon Sep 17 00:00:00 2001
From: Pablo Cantero <pablo@pablocantero.com>
Date: Fri, 3 Jan 2014 11:52:33 -0200
Subject: [PATCH 4/4] Fixes tmuxinator plugin find on OSX

---
 plugins/tmuxinator/_tmuxinator | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index 117685279..cd227b7df 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -25,7 +25,7 @@ case $state in
   args)
     case $line[1] in
       start|open|copy|delete)
-        _configs=(`find ~/.tmuxinator/ -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
+        _configs=(`find ~/.tmuxinator -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
         _values 'configs' $_configs
         ret=0
         ;;