git alias for remote fetching and oh-my-zsh update

12 years ago · 0605a99b4a
parent bcd7409dab
commit 0605a99b4a
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -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

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 35acc62c0382a41d2101488df0b13bbdbb32f2c1
+Subproject commit a4bf3a26842c9782bca1dd9e02e2750f727c4033