Add git branching and rebasing