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

Re: How to pull only a few files from one branch to another?

From
Shawn O. Pearce <spearce@spearce.org>
Date
Jan 24, 2007, 06:07 UTC
Message-ID
<20070124060703.GA25759@spearce.org>
In-Reply-To
<17846.63082.935311.947093@lisa.zopyra.com>
Bill Lear <rael@zopyra.com> wrote:
> I probably should have thought ahead and made this fix on a branch,
> merged it into my master branch and then into my topic branch ... I
> think.

Yes. That is standard "good practice" with Git. Unfortunately it does require a little planning ahead if the base to start on isn't immediately obvious (you need to think "I want this here, and here, and here.. and compute the merge base").

-- 
Shawn.
Previous: Bill LearNext: Andy Whitcroft
Message 14 of 18 in “How to pull only a few files from one branch to another?”
  1. Bill LearJan 24, 2007
  2. Linus TorvaldsJan 24, 2007
  3. Linus TorvaldsJan 24, 2007
  4. Johannes SchindelinJan 24, 2007
  5. Johannes SchindelinJan 24, 2007
  6. Bill LearJan 24, 2007
  7. Yann DirsonJan 24, 2007
  8. Jakub NarebskiJan 24, 2007
  9. Yann DirsonJan 24, 2007
  10. Jakub NarebskiJan 24, 2007
  11. Linus TorvaldsJan 24, 2007
  12. Daniel BarkalowJan 24, 2007
  13. Bill LearJan 24, 2007
  14. Shawn O. PearceJan 24, 2007
  15. Andy WhitcroftJan 24, 2007
  16. Junio C HamanoJan 24, 2007
  17. Jakub NarebskiJan 24, 2007
  18. Daniel BarkalowJan 24, 2007

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.