X-Git-Url: https://git.madduck.net/etc/myrepos.git/blobdiff_plain/f9e5b47e127d5c1d5a0caacf9b97b0c427551cbe..0a36a1d939be4a186fafa87fa7488dbcf974ab25:/.mr/base?ds=inline diff --git a/.mr/base b/.mr/base index 13f48c2..e607d7b 100644 --- a/.mr/base +++ b/.mr/base @@ -17,6 +17,9 @@ checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net [.fgits/screen.git] checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/screen.git' 'screen.git' '../../' +[.fgits/crontab.git] +checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/crontab.git' 'crontab.git' '../../' + [code/mr] checkout = checkout_hack_branch mr \ joeyh git://git.kitenet.net/mr \ @@ -25,11 +28,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