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

Re: configuring cherry-pick to always use -x?

From
Jay Soffian <jaysoffian@gmail.com>
Date
Feb 15, 2011, 16:16 UTC
Message-ID
<AANLkTinMBBKwtkQKgyqaN+oH4-k1Ks_6SbnU7thzuuYs@mail.gmail.com>
In-Reply-To
<4D5A401B.1050103@drmicha.warpmail.net>

On Tue, Feb 15, 2011 at 3:58 AM, Michael J Gruber <git@drmicha.warpmail.net> wrote:

Show 5 quoted lines
> - If you do want them on the same branch "f-release", you probably know
> beforehand which commits you don't want on master. You can fake-merge
> these ("merge -Xours") to master and merge the others, which is somewhat
> ugly but still better than cherry-picking everything. In some sense this
> is "manual rerere" whose results are shared (pushed) easily.(*)

I personally prefer cherry-pick, as the fake merge clutters mainline's history with the superseded commits.

It would be interesting to have a history simplification that given a merge M of parents A and B, ignored commits $(merge-base A B)..B where M is TREESAME to A. Hmm, that's effectively "git rev-list ." isn't it?

j.
Previous: Michael J GruberNext: Adam Monsen
Message 9 of 12 in “configuring cherry-pick to always use -x?”
  1. Adam MonsenFeb 14, 2011
  2. Jay SoffianFeb 14, 2011
  3. Junio C HamanoFeb 14, 2011
  4. Junio C HamanoFeb 14, 2011
  5. Adam MonsenFeb 14, 2011
  6. Michael J GruberFeb 15, 2011
  7. Jonathan NiederFeb 15, 2011
  8. Michael J GruberFeb 15, 2011
  9. Jay SoffianFeb 15, 2011
  10. release maintenance vs. release engineering (was: configuring cherry-pick to always use -x?)Adam Monsen, Feb 15, 2011
  11. Jay SoffianFeb 14, 2011
  12. Ivan KanisFeb 15, 2011

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.