]> git.madduck.net Git - etc/myrepos.git/blobdiff - .mr/base

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

autocreate ~/mail dir
[etc/myrepos.git] / .mr / base
index 3fd88429f14ce270df6f3a6623672df821ecdcaf..df43f756bcdb026e41a43cd93551915f4c2914a8 100644 (file)
--- a/.mr/base
+++ b/.mr/base
@@ -19,15 +19,22 @@ checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net
 
 [code/mr]
 checkout = checkout_hack_branch mr \
 
 [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 remote update; \
-               git checkout -b joeyh joeyh/master;; \
+        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]
          esac
 
 [code/mrsetup]