From 98db891b53cca25a42a0bf9f2aedc39ff60ff9e2 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Mon, 25 Nov 2013 22:18:42 +0900 Subject: [PATCH] use bopen and bclose for git aliases for topic branches --- shrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shrc b/shrc index 7d47ac5..2ab3b94 100755 --- a/shrc +++ b/shrc @@ -309,8 +309,8 @@ __mysetup_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.newb "checkout -b" - $_gitconfig alias.endb \ + $_gitconfig alias.bopen "checkout -b" + $_gitconfig alias.bclose \ "!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"