From bb95ca7bd8daf06ae3d6fef99dfc667b8f89801e Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Sat, 8 Feb 2014 14:44:17 +0900
Subject: [PATCH] git close-branch allow ff merge

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

diff --git a/setup.sh b/setup.sh
index 6764a0b..33e49d0 100755
--- a/setup.sh
+++ b/setup.sh
@@ -141,7 +141,7 @@ setup_gitconf(){
     # workflow
     _git_open_branch="checkout -b"
     _git_close_branch="!sh -cx 'git stash && \
-git checkout master && git merge --no-ff -'"
+git checkout master && git merge -'"
     $_gc alias.open-branch "$_git_open_branch"
     $_gc alias.close-branch "$_git_close_branch"
     $_gc alias.o "$_git_open_branch"