git cherry picking the discarded changes