From 1e67b2a6612814b02a9be5a239b646cacc2c7af2 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Thu, 21 Nov 2013 15:06:50 +0900
Subject: [PATCH] add git alias endb

---
 setup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 26adc25..31f8189 100755
--- a/setup.sh
+++ b/setup.sh
@@ -80,7 +80,9 @@ git_config(){
     # $_gitconfig alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso"
     $_gitconfig alias.addi "add -i"
     $_gitconfig alias.clean-p "!test -z \"\$(git status -s -uno)\""
-    $_gitconfig alias.new "checkout -b"
+    $_gitconfig alias.newb "checkout -b"
+    $_gitconfig alias.endb \
+        "!sh -c '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