git branching extravaganza