Subject: Re: how to apply diff between A and B to a file?

From: Jakub Narebski <[email-masked]>
Date: Mon, 25 Feb 2008 10:58:03 -0800 (PST)

Denis Shaposhnikov <[email-masked]> writes:

> Hello,
> 
> With svn I used a command "svn merge -r A:B some/file" to apply diff
> between revisions A and B to file some/file. I done it in one branch,
> in trunk for example. Is it possible to do such thing with git?

Not using "git merge", which is by design whole tree opration in
Git. It must be, to support rename detection.

You can, however, do the following:

  $ git diff A B -- some/file | git apply --index

(not tested!).
-- 
Jakub Narebski
Poland
ShadeHawk on #git