From bdba2e1b58e0b11d657722306bdb7bc24b2becfd Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Tue, 14 Aug 2012 11:39:41 +0200
Subject: [PATCH 1/9] get upstream version of oh-my-zsh

---
 oh-my-zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh b/oh-my-zsh
index aee8909..6598039 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit aee8909a102024f98e03c40b54e48f97c2aa28a9
+Subproject commit 65980391279c081407b5b46cb7a8606913aace26

From cc06b82413851ca0ed9f6372d1cf75cb645b5168 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Tue, 9 Oct 2012 11:56:04 +0200
Subject: [PATCH 2/9] merged upstream

---
 oh-my-zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh b/oh-my-zsh
index 6598039..61ebc46 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 65980391279c081407b5b46cb7a8606913aace26
+Subproject commit 61ebc46beb433d61f6d330bec8ac8a285e01f932

From 8ceaf9478a7076e00ec5443a865fe6714ea2ba52 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Tue, 9 Oct 2012 11:56:38 +0200
Subject: [PATCH 3/9] add git aliases

---
 gitconfig | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gitconfig b/gitconfig
index 32a96b8..ffc08cd 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,3 +8,12 @@
 	status = auto
 [core]
 	autocrlf = input
+[alias]
+    st = status
+    co = checkout
+	cm = commit
+    br = branch
+    llog = log --date=local
+    changes = diff --name-status -r
+    diffstat = diff --stat -r
+    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative

From cdb7778375e31f4b3063ce631b785b660c2c476b Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Tue, 9 Oct 2012 11:56:58 +0200
Subject: [PATCH 4/9] add beyond compare as mergetool

---
 gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gitconfig b/gitconfig
index ffc08cd..c0165b1 100644
--- a/gitconfig
+++ b/gitconfig
@@ -17,3 +17,7 @@
     changes = diff --name-status -r
     diffstat = diff --stat -r
     lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+[merge]
+    tool = bc3
+[mergetool]
+    cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED

From 54737d39b0e1398c3b5ba7be4a527795a2e70274 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Tue, 9 Oct 2012 11:57:34 +0200
Subject: [PATCH 5/9] no correction for npm apt-get, apt-cache

---
 zsh_nocorrect | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zsh_nocorrect b/zsh_nocorrect
index 5664e30..e115e27 100644
--- a/zsh_nocorrect
+++ b/zsh_nocorrect
@@ -1 +1,4 @@
 git
+npm
+apt-get
+apt-cache

From 87c0ed5bf4a4fa61c88bf24a9661d07563023a17 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Tue, 9 Oct 2012 11:59:01 +0200
Subject: [PATCH 6/9] move node installation into $HOME/local

---
 npmrc | 1 +
 zshrc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 npmrc

diff --git a/npmrc b/npmrc
new file mode 100644
index 0000000..73b78c7
--- /dev/null
+++ b/npmrc
@@ -0,0 +1 @@
+prefix = ~/local
diff --git a/zshrc b/zshrc
index d039c0d..2c493e7 100644
--- a/zshrc
+++ b/zshrc
@@ -36,7 +36,7 @@ if [ -d "$HOME/bin" ] ; then
 fi
 
 # local node install
-NODE_PATH="$HOME/.nave/current"
+NODE_PATH="$HOME/local"
 if [ -d $NODE_PATH ] ; then
     PATH="$NODE_PATH/bin:$PATH"
     export NODE_PATH

From aed5db83f6c71440cc5e2b3221f9acb74d411815 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Tue, 9 Oct 2012 12:09:32 +0200
Subject: [PATCH 7/9] update oh-my-zsh

---
 oh-my-zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh b/oh-my-zsh
index c443926..61ebc46 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit c443926e28d0b6b527eeb87870f7be7dce7c5b35
+Subproject commit 61ebc46beb433d61f6d330bec8ac8a285e01f932

From de45d86ec4c5b1c6cd221bf559230302cfa14eae Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 15 Oct 2012 18:17:41 +0200
Subject: [PATCH 8/9] by default push to the current branch

---
 gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gitconfig b/gitconfig
index c0165b1..f11e935 100644
--- a/gitconfig
+++ b/gitconfig
@@ -21,3 +21,5 @@
     tool = bc3
 [mergetool]
     cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED
+[push]
+	default = current

From fc3bc2025cb6719f746e705b5b61be8e4a4f8c24 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 22 Oct 2012 13:06:16 +0200
Subject: [PATCH 9/9] update oh-my-zsh

---
 oh-my-zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh b/oh-my-zsh
index 61ebc46..8128a5b 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 61ebc46beb433d61f6d330bec8ac8a285e01f932
+Subproject commit 8128a5b89f56efd95fbafe6ce9200d7cda48f45b