From bc61c1f5bde7c827713f63c7858d9a4f84ed229a Mon Sep 17 00:00:00 2001
From: Proctor <steven.proctor@gmail.com>
Date: Thu, 20 Mar 2014 10:07:11 -0500
Subject: [PATCH] add gmerge alias

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

diff --git a/bash/aliases b/bash/aliases
index c60923a..c77405e 100644
--- a/bash/aliases
+++ b/bash/aliases
@@ -14,6 +14,7 @@ alias gpush='git push'
 alias gpull='git pull --ff-only'
 alias gfetch='git fetch'
 alias gdiff='git diff'
+alias gmerge='git merge --ff-only'
 alias merged?='git branch --merged'
 alias gbd='git branch -d'
 alias gpush!='git push -u origin `git rev-parse --abbrev-ref HEAD`'