From d3735ced211d6ea0789103fd85d6e7831c6a5f99 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Mon, 22 Apr 2013 11:04:40 -0500
Subject: [PATCH] Added git update shortcut

update fetches from the upstream remote and then rebases
upstream branch onto the current branch.
---
 git/gitconfig.symlink | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index dcd91d7..3a6180f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -44,6 +44,9 @@
 
     cleanup = "!git remote prune origin && git gc && git clean -df && git stash clear"
 
+    # rebase the current branch with changes from upstream remote
+    update = !git fetch upstream && git rebase upstream/`git rev-parse --abbrev-ref HEAD`
+
     # grep commands
 
     # 'diff grep'