git cherry pick continue without commit