From 7cc4ab9b3f79ed2e56c8bebeb6fbd4b870b53de2 Mon Sep 17 00:00:00 2001
From: James Frasca <james@roundeights.com>
Date: Thu, 17 Mar 2011 11:22:51 -0700
Subject: [PATCH 01/23] Added the Frisk theme

---
 themes/frisk.zsh-theme | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 themes/frisk.zsh-theme

diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
new file mode 100644
index 000000000..f181aec90
--- /dev/null
+++ b/themes/frisk.zsh-theme
@@ -0,0 +1,10 @@
+PROMPT=$'
+%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
+%{$fg_bold[black]%}>%{$reset_color%} '
+
+PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From 06063ab695ecfe6fa7737511a070b24412ee1b2a Mon Sep 17 00:00:00 2001
From: Lorrin Nelson <lhn_github@nerdylorrin.net>
Date: Wed, 23 Mar 2011 21:20:08 -0700
Subject: [PATCH 02/23] Introduce DISABLE_AUTO_TITLE option

---
 lib/termsupport.zsh          | 10 +++++++---
 templates/zshrc.zsh-template |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index e1e536690..b250833ed 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -16,11 +16,15 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
 
 #Appears when you have the prompt
 function precmd {
-  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+  if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
+    title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+  fi
 }
 
 #Appears at the beginning of (and during) of command execution
 function preexec {
-  local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  title "$CMD" "%100>...>$2%<<"
+  if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
+    local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
+    title "$CMD" "%100>...>$2%<<"
+  fi
 }
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 8022b3506..506daa9a2 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -14,6 +14,9 @@ export ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable colors in ls
 # export DISABLE_LS_COLORS="true"
 
+# Uncomment following line if you want to disable autosetting terminal title.
+# export DISABLE_AUTO_TITLE="true"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=(git)

From 2497c57976b1e5002ebecd7ffa5c35bc87ada903 Mon Sep 17 00:00:00 2001
From: Simon Elsbrock <simon@iodev.org>
Date: Thu, 24 Mar 2011 09:47:48 +0100
Subject: [PATCH 03/23] fixed wget command in readme

github uses a wildcard certificate which is not accepted by wget
---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 0659aded8..86d2652bb 100644
--- a/README.textile
+++ b/README.textile
@@ -8,7 +8,7 @@ h2. Setup
 
 h3. The automatic installer... (do you trust me?)
 
-@wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
@@ -66,4 +66,4 @@ I'm far from being a zsh-expert and suspect there are many ways to improve. If y
 
 h3. Send us your theme!
 
-I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
\ No newline at end of file
+I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.

From 57f55e69ed967e93c0fd44a6a7e470781eb38029 Mon Sep 17 00:00:00 2001
From: Jakub Nawalaniec <pielgrzym@prymityw.pl>
Date: Sun, 3 Apr 2011 13:50:05 +0200
Subject: [PATCH 04/23] Zsh will now complete git aliases with git stuff

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 71a62819b..fc4e56fac 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,19 +1,34 @@
 # Aliases
 alias g='git'
+compdef g=git
 alias gst='git status'
+compdef gst=git
 alias gl='git pull'
+compdef gl=git
 alias gup='git fetch && git rebase'
+compdef gup=git
 alias gp='git push'
+compdef gp=git
 alias gd='git diff | mate'
+compdef gd=git
 alias gdv='git diff -w "$@" | vim -R -'
+compdef gdv=git
 alias gc='git commit -v'
+compdef gc=git
 alias gca='git commit -v -a'
+compdef gca=git
 alias gco='git checkout'
+compdef gco=git
 alias gb='git branch'
+compdef gb=git
 alias gba='git branch -a'
+compdef gba=git
 alias gcount='git shortlog -sn'
+compdef gcount=git
 alias gcp='git cherry-pick'
+compdef gcp=git
 alias glg='git log --stat --max-count=5'
+compdef glg=git
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
@@ -29,5 +44,8 @@ function current_branch() {
 
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
+compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
+compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
+compdef ggpnp=git

From 2e9492969b0ea90932ad3f4298330b75ef8cf2ce Mon Sep 17 00:00:00 2001
From: Jakub Nawalaniec <pielgrzym@prymityw.pl>
Date: Sun, 3 Apr 2011 15:43:39 +0200
Subject: [PATCH 05/23] Completions are git subdommand-aware now

---
 plugins/git/git.plugin.zsh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fc4e56fac..8470c28a4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -2,15 +2,16 @@
 alias g='git'
 compdef g=git
 alias gst='git status'
-compdef gst=git
+compdef _git gst=git-status
 alias gl='git pull'
-compdef gl=git
+compdef _git gl=git-pull
 alias gup='git fetch && git rebase'
 compdef gup=git
 alias gp='git push'
-compdef gp=git
+compdef _git gp=git-push
 alias gd='git diff | mate'
-compdef gd=git
+# WTF is mate??
+compdef _git gd=git-diff
 alias gdv='git diff -w "$@" | vim -R -'
 compdef gdv=git
 alias gc='git commit -v'
@@ -18,20 +19,21 @@ compdef gc=git
 alias gca='git commit -v -a'
 compdef gca=git
 alias gco='git checkout'
-compdef gco=git
+compdef _git gco=git-checkout
 alias gb='git branch'
-compdef gb=git
+compdef _git gb=git-branch
 alias gba='git branch -a'
 compdef gba=git
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcp='git cherry-pick'
-compdef gcp=git
+compdef _git gcp=git-cherry-pick
 alias glg='git log --stat --max-count=5'
-compdef glg=git
+compdef _git glg=git-log
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
+compdef git-svn-dcommit-push=git
 
 #
 # Will return the current branch name

From 4cd4167c8d988656eed4896d6d1343e311ce078c Mon Sep 17 00:00:00 2001
From: Jakub Nawalaniec <pielgrzym@prymityw.pl>
Date: Sun, 3 Apr 2011 21:28:19 +0200
Subject: [PATCH 06/23] Further git completion improovements

In detail:
gup - now completes with remotes like git fetch would
gdv - got git diff completions
gc/gca - now zsh will suggest files in staging area
gba - suggestions as for git branch
---
 plugins/git/git.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8470c28a4..9fe7a6467 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -6,24 +6,24 @@ compdef _git gst=git-status
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git fetch && git rebase'
-compdef gup=git
+compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
 alias gd='git diff | mate'
 # WTF is mate??
 compdef _git gd=git-diff
 alias gdv='git diff -w "$@" | vim -R -'
-compdef gdv=git
+compdef _git gdv=git-diff
 alias gc='git commit -v'
-compdef gc=git
+compdef _git gc=git-commit
 alias gca='git commit -v -a'
-compdef gca=git
+compdef _git gca=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
-compdef gba=git
+compdef _git gba=git-branch
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcp='git cherry-pick'

From d138751cbd721bf7036e88cb1a2bafc9ebb87366 Mon Sep 17 00:00:00 2001
From: "Renaud (Nel) Morvan" <nel@w3fu.com>
Date: Mon, 4 Apr 2011 13:30:39 +0200
Subject: [PATCH 07/23] Escape characters used in escape sequence to avoid
 triggering bugs in Apple Terminal

Closes #45 #57 #58 #86.
---
 lib/termsupport.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index b250833ed..494ef8923 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -4,10 +4,10 @@
 #Limited support for Apple Terminal (Terminal can't set window or tab separately)
 function title {
   if [[ "$TERM" == "screen" ]]; then 
-    print -Pn "\ek$1\e\\" #set screen hardstatus, usually truncated at 20 chars
+    print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-    print -Pn "\e]2;$2\a" #set window name
-    print -Pn "\e]1;$1\a" #set icon (=tab) name (will override window name on broken terminal)
+    print -Pn "\e]2;$2:q\a" #set window name
+    print -Pn "\e]1;$1:q\a" #set icon (=tab) name (will override window name on broken terminal)
   fi
 }
 

From a3e92892bbc95acc270d93b45be05c55348da55c Mon Sep 17 00:00:00 2001
From: "Renaud (Nel) Morvan" <nel@w3fu.com>
Date: Mon, 4 Apr 2011 13:44:48 +0200
Subject: [PATCH 08/23] Command title behavior no longer depend on local zsh
 configuration

Fix by derekjw. closes #52.
---
 lib/termsupport.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 494ef8923..42bbb9ef2 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -3,7 +3,7 @@
 #Fully support screen, iterm, and probably most modern xterm and rxvt
 #Limited support for Apple Terminal (Terminal can't set window or tab separately)
 function title {
-  if [[ "$TERM" == "screen" ]]; then 
+  if [[ $TERM =~ "^screen" ]]; then 
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
     print -Pn "\e]2;$2:q\a" #set window name
@@ -24,6 +24,8 @@ function precmd {
 #Appears at the beginning of (and during) of command execution
 function preexec {
   if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
+    emulate -L zsh
+    setopt extended_glob
     local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
     title "$CMD" "%100>...>$2%<<"
   fi

From 0cc0915bf83c1915575182d1287abfc6dd3e6f3c Mon Sep 17 00:00:00 2001
From: "Renaud (Nel) Morvan" <nel@w3fu.com>
Date: Mon, 4 Apr 2011 14:02:50 +0200
Subject: [PATCH 09/23] Refactor DISABLE_AUTO_TITLE to be more DRY

---
 lib/termsupport.zsh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 42bbb9ef2..3152751e4 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -3,6 +3,7 @@
 #Fully support screen, iterm, and probably most modern xterm and rxvt
 #Limited support for Apple Terminal (Terminal can't set window or tab separately)
 function title {
+  [ "$DISABLE_AUTO_TITLE" != "true" ] || return
   if [[ $TERM =~ "^screen" ]]; then 
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
@@ -16,17 +17,13 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
 
 #Appears when you have the prompt
 function precmd {
-  if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
-    title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
-  fi
+  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
 }
 
 #Appears at the beginning of (and during) of command execution
 function preexec {
-  if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
-    emulate -L zsh
-    setopt extended_glob
-    local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-    title "$CMD" "%100>...>$2%<<"
-  fi
+  emulate -L zsh
+  setopt extended_glob
+  local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
+  title "$CMD" "%100>...>$2%<<"
 }

From 91e4f3d667cc04148fafc4675174424daf5f6b5a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 4 Apr 2011 00:54:43 +0200
Subject: [PATCH 10/23] Fix `gdv`: make it a function, and use `view`.

I've changed it to use `view` instead of `vim -R` to make it hopefully
more editor-agnostic.
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8470c28a4..b21c6a8e0 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -12,7 +12,7 @@ compdef _git gp=git-push
 alias gd='git diff | mate'
 # WTF is mate??
 compdef _git gd=git-diff
-alias gdv='git diff -w "$@" | vim -R -'
+gdv() { git diff -w "$@" | view - }
 compdef gdv=git
 alias gc='git commit -v'
 compdef gc=git

From b3a78d2b287cc9789d1c791a91448c40dcab2e23 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 12 Apr 2011 10:19:15 +0200
Subject: [PATCH 11/23] Using git-diff instead of git diff

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 85eabced0..bc340e86b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -9,7 +9,7 @@ alias gup='git fetch && git rebase'
 compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
-gdv() { git diff -w "$@" | view - }
+gdv() { git-diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gc='git commit -v'
 compdef _git gc=git-commit

From f9282283822771a7f471547569de481a66a70b0f Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 20 Mar 2011 16:29:00 -0400
Subject: [PATCH 12/23] Added npm plugin.

---
 plugins/npm/_npm           | 19 +++++++++++++++++++
 plugins/npm/npm.plugin.zsh |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 plugins/npm/_npm
 create mode 100644 plugins/npm/npm.plugin.zsh

diff --git a/plugins/npm/_npm b/plugins/npm/_npm
new file mode 100644
index 000000000..24b536188
--- /dev/null
+++ b/plugins/npm/_npm
@@ -0,0 +1,19 @@
+#compdef npm
+
+# Node Package Manager 0.3.15 completion, letting npm do all the completion work
+
+_npm() {
+  compadd -- $(_npm_complete $words)
+}
+
+# We want to show all errors of any substance, but never the "npm (not )ok" one.
+# (Also doesn't consider "ERR! no match found" worth breaking the terminal for.)
+_npm_complete() {
+  local ask_npm
+  ask_npm=(npm completion --color false --loglevel error -- $@)
+  { _call_program npm $ask_npm 2>&1 >&3 \
+  | egrep -v '^(npm (not |)ok|ERR! no match found)$' >&2; \
+  } 3>&1
+}
+
+_npm "$@"
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
new file mode 100644
index 000000000..826f0f7b0
--- /dev/null
+++ b/plugins/npm/npm.plugin.zsh
@@ -0,0 +1,4 @@
+# add npm completion function to path
+fpath=($ZSH/plugins/npm $fpath)
+autoload -U compinit
+compinit -i

From 8883ace767997d1a629c165780af303f715ee78d Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 12 Apr 2011 10:24:06 +0200
Subject: [PATCH 13/23] Revert "Enable alias completion, do not limit
 completion to just files"

This reverts commit c3a58b00040018743ead1e6672910433fc1ca7c2.
---
 lib/completion.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index e8e9776a5..9c2dfecca 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -4,7 +4,6 @@ unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
 setopt auto_menu         # show completion menu on succesive tab press
 setopt complete_in_word
-setopt complete_aliases
 setopt always_to_end
 
 WORDCHARS=''

From 0447a0ec11ad56d24ad391e9149c8d7e0429b205 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Tue, 1 Mar 2011 01:04:10 -0500
Subject: [PATCH 14/23] added hub plugin from defunkt

---
 plugins/hub/hub.plugin.zsh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 plugins/hub/hub.plugin.zsh

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
new file mode 100644
index 000000000..e82a0ec25
--- /dev/null
+++ b/plugins/hub/hub.plugin.zsh
@@ -0,0 +1,5 @@
+# hub alias from defunkt
+# https://github.com/defunkt/hub
+if [ $( which hub > /dev/null 2>&1 ; echo -n $? ) -lt 1 ]; then
+    eval $( hub alias -s $( ps -o comm= -p $$ ) )
+fi

From 8ed33a8ccc5e926e84bf522951ecf80e97e2a8e6 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Tue, 1 Mar 2011 21:34:25 -0500
Subject: [PATCH 15/23] no need for an extra fork

---
 plugins/hub/hub.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
index e82a0ec25..9f95c6361 100644
--- a/plugins/hub/hub.plugin.zsh
+++ b/plugins/hub/hub.plugin.zsh
@@ -1,5 +1,5 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
 if [ $( which hub > /dev/null 2>&1 ; echo -n $? ) -lt 1 ]; then
-    eval $( hub alias -s $( ps -o comm= -p $$ ) )
+    eval $( hub alias -s zsh )
 fi

From 2717e147b303beef0f84e6dfbb2db562c8fc6740 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Wed, 2 Mar 2011 20:00:40 -0500
Subject: [PATCH 16/23] blueyed's ZSH-fu is much stronger than mine.

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

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
index 9f95c6361..48e1fa4ad 100644
--- a/plugins/hub/hub.plugin.zsh
+++ b/plugins/hub/hub.plugin.zsh
@@ -1,5 +1,5 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
-if [ $( which hub > /dev/null 2>&1 ; echo -n $? ) -lt 1 ]; then
-    eval $( hub alias -s zsh )
+if which hub > /dev/null; then
+    eval $(hub alias -s zsh)
 fi

From 277057cb6399769340d41bba9421464c58742026 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Thu, 3 Mar 2011 21:36:35 -0500
Subject: [PATCH 17/23] Moved this to the existing github plugin

---
 plugins/hub/hub.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 plugins/hub/hub.plugin.zsh

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
deleted file mode 100644
index 48e1fa4ad..000000000
--- a/plugins/hub/hub.plugin.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-# hub alias from defunkt
-# https://github.com/defunkt/hub
-if which hub > /dev/null; then
-    eval $(hub alias -s zsh)
-fi

From 9406ae7929bc1d3a063b65e7559a28268aaf0a7a Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Thu, 3 Mar 2011 21:38:56 -0500
Subject: [PATCH 18/23] Whoops, this was supposed to be in the last commit!

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

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index c23504b85..72e9b07b9 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,3 +1,9 @@
+# hub alias from defunkt
+# https://github.com/defunkt/hub
+if which hub > /dev/null; then
+    eval $(hub alias -s zsh)
+fi
+
 # add github completion function to path
 fpath=($ZSH/plugins/github $fpath)
 autoload -U compinit

From f0922006aba68e485480a81d83ba53b201270a69 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Sat, 19 Mar 2011 10:29:22 -0400
Subject: [PATCH 19/23] changes recommended by blueyed

---
 plugins/github/github.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 72e9b07b9..8d4580654 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,7 +1,8 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
-if which hub > /dev/null; then
-    eval $(hub alias -s zsh)
+if [ "$commands[(I)hub]" ]; then
+    # eval `hub alias -s zsh`
+    function git(){hub "$@"}
 fi
 
 # add github completion function to path

From 7d71148490511ae2ef849a9d95de07ec4a751121 Mon Sep 17 00:00:00 2001
From: Dmitry Maksimov <dmtmax@gmail.com>
Date: Sat, 26 Feb 2011 10:04:45 +0300
Subject: [PATCH 20/23] kolo.zsh-theme

---
 themes/kolo.zsh-theme | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 themes/kolo.zsh-theme

diff --git a/themes/kolo.zsh-theme b/themes/kolo.zsh-theme
new file mode 100644
index 000000000..6e04e1595
--- /dev/null
+++ b/themes/kolo.zsh-theme
@@ -0,0 +1,21 @@
+autoload -U colors && colors
+
+autoload -Uz vcs_info
+
+zstyle ':vcs_info:*' stagedstr '%F{green}●'
+zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:*' enable git svn
+precmd () {
+    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
+    } else {
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
+    }
+
+    vcs_info
+}
+
+setopt prompt_subst
+PROMPT='%B%F{magenta}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}%% '

From 849e2834fb1e4fe27a0b5f997733fd2ae4d8f9b7 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 12 Apr 2011 10:36:45 +0200
Subject: [PATCH 21/23] Updating the README... now links to contributors page

---
 README.textile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.textile b/README.textile
index 86d2652bb..d01c3310a 100644
--- a/README.textile
+++ b/README.textile
@@ -54,12 +54,6 @@ h3. Uninstalling
 
 If you want to uninstall it, just run @uninstall_oh_my_zsh@ from the command line and it'll remove itself and revert you to bash (or your previous zsh config).
 
-h2. Thanks
-
-* Rick Olson (technoweenie) might remember some of the configuration, which I took from a pastie a few years ago.
-* Marcel (noradio) provided Rick the original zsh configuration.
-* Nicholas (ulysses) for the "rake autocompletion code":http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh.
-
 h2. Help out!
 
 I'm far from being a zsh-expert and suspect there are many ways to improve. If you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
@@ -67,3 +61,11 @@ I'm far from being a zsh-expert and suspect there are many ways to improve. If y
 h3. Send us your theme!
 
 I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
+
+h2. Contributors
+
+This project wouldn't exist without all of our awesome users and contributors.
+
+* "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
+
+Thank you so much!
\ No newline at end of file

From 6cbd15f4035ffd79e6e325a256f87443c106c2c6 Mon Sep 17 00:00:00 2001
From: James Frasca <james@roundeights.com>
Date: Thu, 17 Mar 2011 11:22:51 -0700
Subject: [PATCH 22/23] Added the Frisk theme

---
 themes/frisk.zsh-theme | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 themes/frisk.zsh-theme

diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
new file mode 100644
index 000000000..f181aec90
--- /dev/null
+++ b/themes/frisk.zsh-theme
@@ -0,0 +1,10 @@
+PROMPT=$'
+%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
+%{$fg_bold[black]%}>%{$reset_color%} '
+
+PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From 971b071dc67f423d8b2a6f476e1dd58819049f41 Mon Sep 17 00:00:00 2001
From: kphoen <geek63@gmail.com>
Date: Mon, 7 Mar 2011 15:15:46 +0100
Subject: [PATCH 23/23] Add: new theme

---
 themes/kphoen.zsh-theme | 50 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 themes/kphoen.zsh-theme

diff --git a/themes/kphoen.zsh-theme b/themes/kphoen.zsh-theme
new file mode 100644
index 000000000..0e9b5e73c
--- /dev/null
+++ b/themes/kphoen.zsh-theme
@@ -0,0 +1,50 @@
+# ------------------------------------------------------------------------------
+#          FILE:  kphoen.zsh-theme
+#   DESCRIPTION:  oh-my-zsh theme file.
+#        AUTHOR:  Kévin Gomez (geek63@gmail.com)
+#       VERSION:  1.0.0
+#    SCREENSHOT:
+# ------------------------------------------------------------------------------
+
+
+if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
+    PROMPT='[%{$fg[red]%}%n%{$reset_color%}@%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)]
+%# '
+
+    ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
+    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+    ZSH_THEME_GIT_PROMPT_DIRTY=""
+    ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+    # display exitcode on the right when >0
+    return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+    RPROMPT='${return_code}$(git_prompt_status)%{$reset_color%}'
+
+    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
+    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
+    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
+    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
+    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
+    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+else
+    PROMPT='[%n@%m:%~$(git_prompt_info)]
+%# '
+
+    ZSH_THEME_GIT_PROMPT_PREFIX=" on"
+    ZSH_THEME_GIT_PROMPT_SUFFIX=""
+    ZSH_THEME_GIT_PROMPT_DIRTY=""
+    ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+    # display exitcode on the right when >0
+    return_code="%(?..%? ↵)"
+
+    RPROMPT='${return_code}$(git_prompt_status)'
+
+    ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
+    ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹"
+    ZSH_THEME_GIT_PROMPT_DELETED=" ✖"
+    ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
+    ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
+    ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭"
+fi