Using Git revert to ‘hide’ cherry-picked commits - this seems nicer than rebasing in some cases.