From 0605a99b4aa2a62ad08de7b19a0f86a06285e273 Mon Sep 17 00:00:00 2001
From: Steffen Becker <nebelschwade@gmail.com>
Date: Tue, 9 Oct 2012 19:11:42 +0200
Subject: [PATCH] git alias for remote fetching and oh-my-zsh update

---
 gitconfig | 1 +
 oh-my-zsh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index 5195960..080e72e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -40,6 +40,7 @@
   rs = reset HEAD --hard
   hist = log --pretty=format:\"%h | %ad | %an | %s%d \" --graph --date=local
   lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
+  pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"
   type = cat-file -t
   dump = cat-file -p
 
diff --git a/oh-my-zsh b/oh-my-zsh
index 35acc62..a4bf3a2 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 35acc62c0382a41d2101488df0b13bbdbb32f2c1
+Subproject commit a4bf3a26842c9782bca1dd9e02e2750f727c4033