X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/15777c43598bbd99578adc2f7404561ce20735d8..e899aac40c09604b3b9970f1e41d81660586d7be:/mrconfig.complex diff --git a/mrconfig.complex b/mrconfig.complex index 6e82666..21974b5 100644 --- a/mrconfig.complex +++ b/mrconfig.complex @@ -9,11 +9,11 @@ include = cat /usr/share/mr/* 2>/dev/null || true # Teach mr to run a few git and svn specific commands. svn_cleanup = svn cleanup "$@" git_gc = git gc "$@" -git_push = git push "$@" -svn_push = : git_tag = git tag -l svn_tag = svn ls "$(LC_ALL=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')" -# This hack is here because git-pull stupidly outputs tag info to stderr. +# I prefer to git-svn rebase to fetch +git_svn_update = git svn rebase +# This hack is here because git pull stupidly outputs tag info to stderr. # Shut it up but let real errors through, for use in cron. quietupdate = mr -s -n update 3>&1 1>/dev/null 2>&3 | egrep -v '(storing tag|tag: )' || true # Tests used below. @@ -63,7 +63,7 @@ lib = } # The root of my home directory. -[] +[.] order = 1 checkout = if anon; then