git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: merging question

From
PEPeter Eriksen <s022018@student.dtu.dk>
Date
Jan 30, 2006, 19:14 UTC
Message-ID
<20060130191424.GA15953@ebar091.ebar.dtu.dk>
In-Reply-To
<43DE3D73.60904@f2s.com>
On Mon, Jan 30, 2006 at 04:23:15PM +0000, Ian Molton wrote:
Show 6 quoted lines
> 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
Previous: Ian Molton
Message 2 of 2 in “merging question”
  1. Ian MoltonJan 30, 2006
  2. Peter EriksenJan 30, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.