how to apply diff between A and B to a file?

Denis Shaposhnikov· Feb 25, 2008, 18:43 UTC · lore

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?

Thanks!

-- 
DSS5-RIPE DSS-RIPN mailto:dsh@wizard.volgograd.ru xmpp:dsh@vlink.ru
http://wizard.volgograd.ru/ 2:550/5068@fidonet 2:550/5069@fidonet

Jakub Narebski· Feb 25, 2008, 18:58 UTC · re: Denis Shaposhnikov · lore

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

Denis Shaposhnikov <dsh@wizard.volgograd.ru> writes:

Show 5 quoted lines

> 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