I used to `hg record` and was looking for the same thing in `git`, but found only `git add -i` which was kind of confusing and counter-intuitive, so I just copy file, revert it (and again, I have to lookup `hg revert` equivalent each time) and merge changes with WinMerge manually. `git add -p` is just what I need. Thanks. I'll try to remember that for the next time.