X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/13edc14d59b4e18b4d471a3bd97f062bdac02d22..466a94bc78c2ee68a2aef9f2448606126c141e99:/mrconfig.complex?ds=inline diff --git a/mrconfig.complex b/mrconfig.complex index 8eef5eb..47cf979 100644 --- a/mrconfig.complex +++ b/mrconfig.complex @@ -9,10 +9,10 @@ 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/')" +# 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