Permalink
Browse files

add git command for merging with an upstream

  • Loading branch information...
1 parent 0e7cb15 commit 67a3e0e14823c8ff387ae7d45deeb616b1fe9341 @baphled committed Feb 18, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitconfig
View
@@ -51,6 +51,7 @@
pom = push origin master
b = branch
lstat = log --stat
+ pu = !git fetch origin -v; git fetch upstream -v; git merge upstream/master
[format]
pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset

0 comments on commit 67a3e0e

Please sign in to comment.