From: martin f. krafft Date: Tue, 24 Aug 2010 09:10:25 +0000 (+0200) Subject: add branch cleanup code to code/mr X-Git-Url: https://git.madduck.net/etc/myrepos.git/commitdiff_plain/dd2897b6650b70fb32f1d4dba4abdf9b51a05cb0?ds=sidebyside add branch cleanup code to code/mr --- diff --git a/.mr/base b/.mr/base index a34668d..059b590 100644 --- a/.mr/base +++ b/.mr/base @@ -34,7 +34,10 @@ checkout = checkout_hack_branch mr \ ln -fs ../code/mr/mr ~/.bin/mr git branch vcsh origin/vcsh update = case "$(git config --get remote.origin.url)" in - *git.madduck.net*) git pull "$@";; + *git.madduck.net*|madduck:*) + git branch -D fu 2>/dev/null || : + git branch -r -d origin/fu 2>/dev/null || : + git pull "$@";; *) git remote add joeyh git://git.kitenet.net/mr || : git fetch joeyh git checkout -b joeyh joeyh/master || :