# HG changeset patch # User Steve Losh # Date 1401378580 14400 # Node ID 9bb8e8c9ca90ca94cfe7ac527b29828627b476d9 # Parent 6dbb848c0675df4a987219922288043870308b1a more git alias shit diff -r 6dbb848c0675 -r 9bb8e8c9ca90 gitconfig --- a/gitconfig Thu May 29 11:49:26 2014 -0400 +++ b/gitconfig Thu May 29 11:49:40 2014 -0400 @@ -73,6 +73,7 @@ uu = !git merge --ff-only upstream/`git currentbranch` fuu = "!sh -c 'git fu && git uu' -" + fuum = "!sh -c 'git co master && git fuu' -" addremove = !git add . && git add -u addrem = !git addremove