From 484a420e349de13d8db19307afe526827f08692f Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Thu, 21 Nov 2013 15:11:57 +0900
Subject: [PATCH] git endb show what it does

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

diff --git a/setup.sh b/setup.sh
index 31f8189..371d2e9 100755
--- a/setup.sh
+++ b/setup.sh
@@ -82,7 +82,7 @@ git_config(){
     $_gitconfig alias.clean-p "!test -z \"\$(git status -s -uno)\""
     $_gitconfig alias.newb "checkout -b"
     $_gitconfig alias.endb \
-        "!sh -c 'git stash && git checkout master && git merge --no-ff -'"
+        "!sh -cx 'git stash && git checkout master && git merge --no-ff -'"
     #$_gitconfig alias.wc "!git ls-files -z | xargs -0 wc"
     # $_gitconfig push.default "simple"
     if _iswindows; then