]> git.madduck.net Git - code/myrepos.git/blobdiff - mrconfig.complex

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:

* Improve "in subdir" message.
[code/myrepos.git] / mrconfig.complex
index c59c8fe46b69aa88f0c0c8434f4a459a06510bd5..2d566c3ccb92cc94d4c31d9c1ce2c40ac2e6bc14 100644 (file)
@@ -11,9 +11,9 @@ gc = if [ -d "$MR_REPO"/.git ]; then git gc; fi
 push = if [ -d "$MR_REPO"/.git ]; then git push; fi
 # And how to list tags for git and svn.
 tag = 
 push = if [ -d "$MR_REPO"/.git ]; then git push; fi
 # And how to list tags for git and svn.
 tag = 
-       if [ -d "$MR_REPO"/.svn ]; then
-               git tag
-       elsif [ -d "$MR_REPO"/.git ]; then
+       if [ -d "$MR_REPO"/.git ]; then
+               git tag -l
+       elsif [ -d "$MR_REPO"/.svn ]; then
                url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
                svn ls "$(echo '$url' | sed -e 's/trunk/tags/')"
        else
                url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
                svn ls "$(echo '$url' | sed -e 's/trunk/tags/')"
        else
@@ -69,7 +69,7 @@ skip = ! wantsrc
 [src/linux-2.6]
 checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 skip = ! mylaptop || ! wantsrc ||
 [src/linux-2.6]
 checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 skip = ! mylaptop || ! wantsrc ||
-       ([ "$1" = update ] && [ $(hours_since "$1") -lt 12 ])
+       ([ "$1" = update ] && ! hours_since "$1" 12)
 
 [src/dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.
 
 [src/dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.
@@ -104,6 +104,16 @@ update = svn update && svnfix
 checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/mail
 skip = ! private
 
 checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/mail
 skip = ! private
 
+# I don't keep my music in revision control, but mr can be taught to use
+# unison to synchronise it.
+[sound]
+checkout = unison -batch sound
+update = unison -batch sound
+commit = unison sound
+skip = ! wantmedia
+# Update this last of all.
+order = 100
+
 # Example of how to remember to delete a repo, when one mrconfig file is
 # used on multiple systems. If you're feeling brave, use rm -rf $MR_REPO
 # instead. This approach can also be used for renames.
 # Example of how to remember to delete a repo, when one mrconfig file is
 # used on multiple systems. If you're feeling brave, use rm -rf $MR_REPO
 # instead. This approach can also be used for renames.