git undo diverged branch