From: martin f. krafft Date: Sun, 18 May 2008 14:04:00 +0000 (+0000) Subject: more failproof mr hack branch switch X-Git-Url: https://git.madduck.net/etc/myrepos.git/commitdiff_plain/0a2effcddbe1ee4b4d12862b6f753750f3f49b6d?ds=sidebyside more failproof mr hack branch switch --- diff --git a/.mr/base b/.mr/base index 13f48c2..df43f75 100644 --- a/.mr/base +++ b/.mr/base @@ -25,11 +25,11 @@ checkout = checkout_hack_branch mr \ git branch vcsh origin/vcsh update = case "$(git config --get remote.origin.url)" in *git.madduck.net*) git pull "$@";; - *) git remote add joeyh git://git.kitenet.net/mr + *) git remote add joeyh git://git.kitenet.net/mr || : git fetch joeyh - git checkout -b joeyh joeyh/master - git branch -d master - git remote rm origin + git checkout -b joeyh joeyh/master || : + git branch -d master || : + git remote rm origin || : git remote add origin ssh://git.madduck.net/~/git/pub/code/mr.git git fetch origin git branch master origin/master