cherry pick git continue