git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jakub Narebski <jnareb@gmail.com>
Date
Feb 25, 2008, 18:58 UTC
Message-ID
<m3fxvgc18q.fsf@localhost.localdomain>
In-Reply-To
<20080225214326.353d0e95@wizard.volgograd.ru>
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
Previous: Denis Shaposhnikov
Message 2 of 2 in “how to apply diff between A and B to a file?”
  1. Denis ShaposhnikovFeb 25, 2008
  2. Jakub NarebskiFeb 25, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.