git diverged branches reset