Answering my own question. On Thu, Mar 11, 2010 at 10:54 AM, Chris Packham <judge.packham@xxxxxxxxx> wrote: > Alternatively I could manually drive and external merge tool like > kdiff3 if I had a recipe for getting the common ancestor revision. > Something like > > git checkout <magic pathspec> -- file > mv file file.base git checkout $(git merge-base master vendor) -- file Still if anyone has a cleaner way of doing this I'd like to hear it. It especially like a one-shot get file X from revision Y save as Z. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html