From: "Shawn O. Pearce" <spearce@spearce.org>
To: Bill Lear <rael@zopyra.com>
Cc: Daniel Barkalow <barkalow@iabervon.org>, git@vger.kernel.org
Subject: Re: How to pull only a few files from one branch to another?
Date: Wed, 24 Jan 2007 01:07:04 -0500 [thread overview]
Message-ID: <20070124060703.GA25759@spearce.org> (raw)
In-Reply-To: <17846.63082.935311.947093@lisa.zopyra.com>
Bill Lear <rael@zopyra.com> wrote:
> I probably should have thought ahead and made this fix on a branch,
> merged it into my master branch and then into my topic branch ... I
> think.
Yes. That is standard "good practice" with Git. Unfortunately it
does require a little planning ahead if the base to start on isn't
immediately obvious (you need to think "I want this here, and here,
and here.. and compute the merge base").
--
Shawn.
next prev parent reply other threads:[~2007-01-24 6:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-24 3:24 How to pull only a few files from one branch to another? Bill Lear
2007-01-24 4:11 ` Linus Torvalds
2007-01-24 4:18 ` Linus Torvalds
2007-01-24 10:14 ` Johannes Schindelin
2007-01-24 10:16 ` Johannes Schindelin
2007-01-24 11:03 ` Bill Lear
2007-01-24 20:39 ` Yann Dirson
2007-01-24 20:46 ` Jakub Narebski
2007-01-24 21:27 ` Yann Dirson
2007-01-24 22:04 ` Jakub Narebski
2007-01-24 21:30 ` Linus Torvalds
2007-01-24 5:29 ` Daniel Barkalow
2007-01-24 6:02 ` Bill Lear
2007-01-24 6:07 ` Shawn O. Pearce [this message]
2007-01-24 14:52 ` Andy Whitcroft
2007-01-24 6:58 ` Junio C Hamano
2007-01-24 9:32 ` Jakub Narebski
2007-01-24 19:46 ` Daniel Barkalow
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=20070124060703.GA25759@spearce.org \
--to=spearce@spearce.org \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=rael@zopyra.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.