From aa68ff0a7543a06e9eee3dc212afcb2345f051c2 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Sun, 26 Jan 2014 15:37:39 +0900
Subject: [PATCH] add alias open-branch and close-branch

---
 setup.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.sh b/setup.sh
index a560522..edc5b0e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -137,10 +137,12 @@ setup_gitconf(){
     $_gc alias.addi "add -i"
     $_gc alias.clean-p "!test -z \"\$(git status -s -uno)\""
 
-    # alias bopen and bclose, which can be useful for topic branching
-    $_gc alias.bopen "checkout -b"
-    $_gc alias.bclose \
+    # alias open-branch and close-branch, which can be useful for topic branching
+    $_gc alias.open-branch "checkout -b"
+    $_gc alias.close-branch \
         "!sh -cx 'git stash && git checkout master && git merge --no-ff -'"
+    $_gc alias.open "open-branch"
+    $_gc alias.close "close-branch"
 
     $_gc alias.todo "grep -E -i 'todo:|note:|fixme:'"