I'm still unconvinced that git is a better solution for source control than subversion for my needs, but saving this for the next time I need to get my head round how it works.
After resisting learning python (although not until I'd tried to get to grips with it once or twice) it looks like I might be needing this sometime soon...