From: Jakub Narebski <jnareb@gmail.com>
To: Denis Shaposhnikov <dsh@wizard.volgograd.ru>
Cc: git@vger.kernel.org
Subject: Re: how to apply diff between A and B to a file?
Date: Mon, 25 Feb 2008 10:58:03 -0800 (PST) [thread overview]
Message-ID: <m3fxvgc18q.fsf@localhost.localdomain> (raw)
In-Reply-To: <20080225214326.353d0e95@wizard.volgograd.ru>
Denis Shaposhnikov <dsh@wizard.volgograd.ru> 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
prev parent reply other threads:[~2008-02-25 18:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-25 18:43 how to apply diff between A and B to a file? Denis Shaposhnikov
2008-02-25 18:58 ` Jakub Narebski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3fxvgc18q.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=dsh@wizard.volgograd.ru \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).