zotero/zotero — comment on commit 9457927a3e49afd17af4da200c9f1e1daa531ce7
File:  line 0
By fbennett:

Simon: What git incantation do you use to pull in single commits from another repo? I have tried various things with cherry-pick and format-patch, and everything but "git show XXX" on the object (to dump a patch that I can apply outside of git) seems to go nuts, pulling in everything up to the head of 3.0, which I have set up as a tracking branch.

Ordinarily that would be fine, but the locales in MLZ are sorted differently, so anything that touches locales produces a huge number of conflicts in each of the locale files; for those commits, it is more efficient to apply the en-US patch, and then update using a local tool. But I can't get git to act selectively, so at the moment I'm basically only using it as an online storage container.

I can cope with my current method, but it's possible to work more efficiently, I'd like to do so.