Damn. Can't get git to do what I want...