Optimise pick --fold to use git-apply first