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

How to pick a commit from another git tree?

From
JTJoakim Tjernlund <joakim.tjernlund@transmode.se>
Date
Oct 7, 2007, 17:31 UTC
Message-ID
<000101c80907$d461a810$04ac10ac@Jocke>
Hi

This is probably a somewhat stupid question but I havn't had a need until now so here goes: There is a commit in David Millers tree: http://git.kernel.org/?p=linux/kernel/git/davem/bak-net-2.6.24.git;a=commit;h=bbb4c0c35a4c2aed5e025b668c8dfc99c5b74cff that hasn't made it into 2.6.23, but will go into 2.6.24. I need this fix on top of 2.6.23(once it is released). Now I wonder how to best add this fix to my tree. Once this fix hits linus tree and I pull linus tree, I don't wan't a conflict as I already have this fix in my tree.

Should I just pull Davids tree? Or should I cherry-pick this one commit? Or something else?

 Jocke
Next: Pierre Habouzit
Message 1 of 3 in “How to pick a commit from another git tree?”
  1. Joakim TjernlundOct 7, 2007
  2. Pierre HabouzitOct 7, 2007
  3. Alex RiesenOct 7, 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.