How do I copy a version of a single file from one git branch to another?

Question

I've got two branches that are fully merged together.

However, after the merge is done, I realise that one file has been messed up by the merge (someone else did an auto-format, gah), and it would just be easier to change to the new version in the other branch, and then re-insert my one line change after bringing it over into my branch.

So what's the easiest way in git to do this?

Answer 1

Figured it out. Run this from the branch where you want the file to end up:

git checkout otherbranch myfile.txt

Answer 2

What about :

  git diff "$branch" | diffstat
  git checkout --merge "$branch" "$file"
  git diff "$branch" | diffstat

-- http://rzr.online.fr/q/git

Answer 3

But this would not transfer the commit history of the file in otherbranch. What I would love to see is a way to just "merge" a single file from one branch to another keeping its revision history.