From cfc738c67c0ed43f41a73014160061f59090a40e Mon Sep 17 00:00:00 2001
From: Proctor <steven.proctor@gmail.com>
Date: Thu, 20 Mar 2014 10:04:59 -0500
Subject: [PATCH] update gpull to use --ff-only flag

---
 bash/aliases | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash/aliases b/bash/aliases
index 39a9492..c60923a 100644
--- a/bash/aliases
+++ b/bash/aliases
@@ -11,7 +11,7 @@ alias gaa='git add .'
 alias gco='git checkout'
 alias gc='git commit'
 alias gpush='git push'
-alias gpull='git pull'
+alias gpull='git pull --ff-only'
 alias gfetch='git fetch'
 alias gdiff='git diff'
 alias merged?='git branch --merged'