git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ben Greear <greearb@candelatech.com>
To: git@vger.kernel.org
Subject: How to pull a single changeset from a child branch into a parent branch?
Date: Thu, 09 Feb 2006 20:03:54 -0800	[thread overview]
Message-ID: <43EC10AA.1040800@candelatech.com> (raw)

I have a linux-2.6 repo with two branches off of 2.6.13.

One branch (ben_v13) has just my own changes.
A second branch (work_v13) has the 2.6.13.5 patch, and I've also pulled
ben_v13 into it.

Now, I made a small change to work_v13, and I'd like to pull only
that changeset into ben_v13.  Is there a way to do that w/out
having to export and apply a patch?

Thanks,
Ben

-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

             reply	other threads:[~2006-02-10  4:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-10  4:03 Ben Greear [this message]
2006-02-10  5:01 ` How to pull a single changeset from a child branch into a parent branch? Junio C Hamano
2006-02-10 21:16   ` Ben Greear

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=43EC10AA.1040800@candelatech.com \
    --to=greearb@candelatech.com \
    --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).