X-Git-Url: https://git.madduck.net/etc/myrepos.git/blobdiff_plain/f57c05d7af65adc00bb5baba7d0eef34d6cddee2..f9e5b47e127d5c1d5a0caacf9b97b0c427551cbe:/.mr/base

diff --git a/.mr/base b/.mr/base
index df03bd9..13f48c2 100644
--- a/.mr/base
+++ b/.mr/base
@@ -3,7 +3,7 @@ checkout = git_fake_bare_checkout 'ssh://git.madduck.net/~/git/pub/etc/mr.git' '
 
 [.fgits/ssh.git]
 checkout = git_fake_bare_checkout 'ssh://git.madduck.net/~/git/pub/etc/ssh.git' 'ssh.git' '../../' && make -C ~/.ssh
-update = git pull "$@" && make -C ~/.ssh
+update = GIT_DIR=$MR_REPO git pull "$@" && make -C ~/.ssh
 
 [.fgits/git.git]
 checkout = git_fake_bare_checkout 'ssh://git.madduck.net/~/git/pub/etc/git.git' 'git.git' '../../'
@@ -16,3 +16,26 @@ 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' '../../'
+
+[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
+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