From: Avery Pennarun <apenwarr@gmail.com>
To: Joshua Jensen <jjensen@workspacewhiz.com>
Cc: joe higton <draxil@gmail.com>, git@vger.kernel.org
Subject: Re: Git merge selective files
Date: Tue, 9 Jun 2009 15:39:31 -0400 [thread overview]
Message-ID: <32541b130906091239x1c92a1caxd260983a66e8025f@mail.gmail.com> (raw)
In-Reply-To: <4A2EB575.8050107@workspacewhiz.com>
On Tue, Jun 9, 2009 at 3:18 PM, Joshua Jensen<jjensen@workspacewhiz.com> wrote:
> On Tue, Jun 9, 2009 at 5:53 AM, joe higton<draxil@gmail.com> wrote:
>> I want to merge changes from a branch but only to one file, I
>> don't want to pick up the changes from other files. I've scoured
>> google and the docs a bit but I can't find anything useful. Is this
>> possible?
>
> I like this one:
>
> http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/
Careful... that *replaces* the files with the ones from the branch.
It doesn't *merge* them. Although that may be exactly what you want.
And the "'merge --squash' and don't commit the changes you don't want"
option looks okay to me too.
Avery
next prev parent reply other threads:[~2009-06-09 19:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 9:53 Git merge selective files joe higton
2009-06-09 18:32 ` Avery Pennarun
[not found] ` <4A2EB575.8050107@workspacewhiz.com>
2009-06-09 19:39 ` Avery Pennarun [this message]
2009-06-09 20:54 ` Junio C Hamano
2009-06-09 19:35 ` Alex Riesen
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=32541b130906091239x1c92a1caxd260983a66e8025f@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=draxil@gmail.com \
--cc=git@vger.kernel.org \
--cc=jjensen@workspacewhiz.com \
/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).