simplifying cherry picking instructions in Git