From f6b563567222fbd4cb6c099eaac5155c85b409cd Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Fri, 12 Dec 2014 16:59:21 +0900
Subject: [PATCH] setup.sh: Add git alias ffme

---
 setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.sh b/setup.sh
index fc3bdb4..737cda3 100755
--- a/setup.sh
+++ b/setup.sh
@@ -225,6 +225,7 @@ setup_gitconf(){
     $_gc alias.cim "commit --verbose -m"
     $_gc alias.di "diff --color"
     $_gc alias.me "merge --no-ff --stat --verbose"
+    $_gc alias.ffme "merge --ff-only --stat --verbose"
     $_gc alias.gr "grep -n"
     $_gc alias.ls "ls-files"
     # $_gc alias.ls "ls-files -v --full-name"