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 14, 2011, 21:53 UTC
Message-ID
<AANLkTikKXLBf2HYk2CZmVMzgVhYUAL=URFTZ851eb5do@mail.gmail.com>
In-Reply-To
<AANLkTimi=d0qbO3_-BEnPEJ+iy9B=_fksF7TiBE7HorC@mail.gmail.com>
On Mon, Feb 14, 2011 at 4:05 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Not currently, but before we go any further, could you please justify
> in what workflow it would make sense to use -x most of the time?

In one of my repos, most of the time my cherry-picks are between two public branches. Perhaps a better enhancement would be something like:

  branch.<name>.annotate_cherry_pick = {true, false}

which could be set to true for source branches that you wish to default to -x. Or, maybe it makes sense in cases where the source branch is a remote-tracking branch:

   cherry_pick.annotate = {local, remote}

I'm not sure how good a remote-tracking branch is as an indicator of 'public branch', though, so I think explicitly configuring it per-branch makes more sense. I hesitate there only because we don't currently put remote-tracking branches in the branch section names.

j.
Previous: Adam MonsenNext: Ivan Kanis
Message 11 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.