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

Merging to and from non-current branches.

From
Llists@mgreg.com <lists@mgreg.com>
Date
Aug 4, 2009, 23:21 UTC
Message-ID
<D5200130-C7D7-4010-BF62-3A3374F2E3B0@mgreg.com>
Hi All,

I've been reading up on some of the GIT commands and I'm not sure if what I want/need exists. Basically I want to merge all changes from one branch to another, regardless of whether I'm in either of those branches. At the very least I would like to merge an existing "development" branch with the "master" branch without needing to first check out master. I've seen rebase, but I'm not absolutely sure what that's doing. Thoughts?

Best, Michael

Next: Daniel Barkalow
Message 1 of 11 in “Merging to and from non-current branches.”
  1. lists@mgreg.comAug 4, 2009
  2. Daniel BarkalowAug 5, 2009
  3. lists@mgreg.comAug 5, 2009
  4. Adam BrewsterAug 5, 2009
  5. Sverre RabbelierAug 5, 2009
  6. Alex RiesenAug 5, 2009
  7. lists@mgreg.comAug 6, 2009
  8. Randal L. SchwartzAug 6, 2009
  9. Daniel BarkalowAug 6, 2009
  10. Junio C HamanoAug 6, 2009
  11. Steffen SiebertAug 6, 2009

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.