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

Noob question on using branches

From
BRBarry Roberts <blr@robertsr.us>
Date
May 6, 2008, 15:47 UTC
Message-ID
<48207DA4.80502@robertsr.us>

I have a branch in my git repository that is a "released" branch. It only gets defect fixes as they are needed to patch our production servers.

I want to get all those defect fixes back into the master, but I don't want changes from the master getting into the production branch, so I don't think I want to do: git checkout master git merge production

right?

It looks like "git pull --squash . production" will do what I want. Is that correct, or is there a better way? git cherry-pick seems cumbersome when I already know I want everything in the branch (unless there's a way to tell cherry-pick to get the whole branch and I've missed that).

Thanks, Barry Roberts

Next: Matthieu Moy
Message 1 of 3 in “Noob question on using branches”
  1. Barry RobertsMay 6, 2008
  2. Matthieu MoyMay 6, 2008
  3. Barry RobertsMay 6, 2008

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.