From 71508df6f1b74c102ad45fc5b010a2ce59a1127c Mon Sep 17 00:00:00 2001
From: Gea-Suan Lin <darkkiller@gmail.com>
Date: Mon, 17 Mar 2014 02:22:05 +0800
Subject: [PATCH] Add "git up".

Reference:
http://stackoverflow.com/questions/15316601/in-what-cases-could-git-pull-be-harmful
---
 .gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitconfig b/.gitconfig
index be03d7a..b3489ce 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,6 +7,7 @@
     gl = log --decorate --graph --pretty=oneline
     glog = log --decorate --graph
     st = status -bs
+    up = "!git remote update -p; git merge --ff-only @{u}"
 [color]
     ui = auto
 [core]