X-Git-Url: https://git.madduck.net/etc/myrepos.git/blobdiff_plain/3e2a000afbbc3f16ac6e79426f4a552a67e2526b..636ff79650c912cfa0a320e0bbfa1888202c513f:/.mr/base?ds=sidebyside diff --git a/.mr/base b/.mr/base index b640106..df43f75 100644 --- a/.mr/base +++ b/.mr/base @@ -19,10 +19,23 @@ checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net [code/mr] checkout = checkout_hack_branch mr \ - joeyh git://git.kitenet.net/mr \ - ssh://git.madduck.net/~/git/pub/code/mr.git - ln -fs ../code/mr/mr ~/.bin/mr - git branch vcsh origin/vcsh + joeyh git://git.kitenet.net/mr \ + ssh://git.madduck.net/~/git/pub/code/mr.git + 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 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 remote add origin ssh://git.madduck.net/~/git/pub/code/mr.git + git fetch origin + git branch master origin/master + git checkout -b vcsh origin/vcsh + ;; + esac [code/mrsetup] checkout = git clone ssh://git.madduck.net/~/git/pub/etc/mrsetup.git mrsetup