From: "Peter Eriksen" <s022018@student.dtu.dk>
To: git@vger.kernel.org
Subject: Re: merging question
Date: Mon, 30 Jan 2006 20:14:24 +0100 [thread overview]
Message-ID: <20060130191424.GA15953@ebar091.ebar.dtu.dk> (raw)
In-Reply-To: <43DE3D73.60904@f2s.com>
On Mon, Jan 30, 2006 at 04:23:15PM +0000, Ian Molton wrote:
> Is it possible to merge all the changes up to a specific tagged version
> of another branch ?
>
> I'd like to pull all the changes up to 2.6.15 into a branch created from
> 2.6.12, which has been subsequently modified. I dont yet want to pull
> later changes in.
This is what I tried to do, and it seems to work:
git checkout -b mywork v2.6.12
# work, work, work
git commit -a
git merge "Merging happily." mywork v2.6.15
The man pages can explain it better than I can.
> on a side note, how does one pull in an individual changeset, rather
> than the head of an entire branch ?
Look into git-cherry and git-cherry-pick.
Regards,
Peter
prev parent reply other threads:[~2006-01-30 19:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-30 16:23 merging question Ian Molton
2006-01-30 19:14 ` Peter Eriksen [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=20060130191424.GA15953@ebar091.ebar.dtu.dk \
--to=s022018@student.dtu.dk \
--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).