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

Re: [RFC] cherry-pick using multiple parents to implement -x

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 8, 2008, 07:55 UTC
Message-ID
<7v1vzvgjg1.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<48C4D631.3010604@gnu.org>
Paolo Bonzini <bonzini@gnu.org> writes:
> Question: how are topic branches managed in git.git?  In particular, how
> are "graduations to master" done?  Do you cherry-pick the merge commit
> that went into "next"?

Topics meant for master are always forked at the tip of master (or older) and they are merged back to master when they prove Ok.

Topics that are fixes are forked at maint (or older) and if they are trivial they are merged straight to maint and gets merged up to master. Otherwise they are merged to next, cooked for a while, then merged to master, cooked even more, and then finally merged to maint.

Of course, I am not perfect (I said I am not Linus, didn't I?) and do not have perfect foresight, so sometimes I do a fix directly on 'master' and realize it should also apply to 'maint' some time later. They need to be cherry-picked.

Previous: Paolo BonziniNext: Junio C Hamano
Message 14 of 25 in “[RFC] cherry-pick using multiple parents to implement -x”
  1. Stephen R. van den BergSep 7, 2008
  2. Jeff KingSep 7, 2008
  3. Stephen R. van den BergSep 7, 2008
  4. Jeff KingSep 7, 2008
  5. Stephen R. van den BergSep 7, 2008
  6. Jeff KingSep 8, 2008
  7. Stephen R. van den BergSep 8, 2008
  8. Junio C HamanoSep 7, 2008
  9. Stephen R. van den BergSep 7, 2008
  10. Thomas RastSep 7, 2008
  11. Junio C HamanoSep 7, 2008
  12. Junio C HamanoSep 7, 2008
  13. Paolo BonziniSep 8, 2008
  14. Junio C HamanoSep 8, 2008
  15. Junio C HamanoSep 7, 2008
  16. Stephen R. van den BergSep 8, 2008
  17. Paolo BonziniSep 8, 2008
  18. Stephen R. van den BergSep 8, 2008
  19. Jakub NarebskiSep 8, 2008
  20. Paolo BonziniSep 8, 2008
  21. Shawn O. PearceSep 8, 2008
  22. Stephen R. van den BergSep 8, 2008
  23. Shawn O. PearceSep 8, 2008
  24. Stephen R. van den BergSep 9, 2008
  25. Paolo BonziniSep 8, 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.