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

Re: [PATCH] stash: allow custom conflict labels for pop

From
Harald Nordgren <haraldnordgren@gmail.com>
Date
Oct 2, 2026, 07:21 UTC
Message-ID
<CAHwyqnWQUHi3d8HKBAWzEgHoGwqSRfUnMy4jkVT-m2NWwnEizQ@mail.gmail.com>
In-Reply-To
<xmqqfqyq8lwj.fsf@gitster.g>
Show 8 quoted lines
> This is not a new problem, but is it just me who finds this
> "feature" more about "because we can do it", not "because we need to
> have it"?  Stepping back a bit, why did we add these three options
> to "stash apply" in the first place?
>
> If there is no good use case, perhaps what we should be doing is to
> remove from "git stash apply" these three options, not adding the
> same to another command.
Let's scrap this.

Would be interesting to remove it from 'apply' too. Can we "hide" it by keeping it but just not documenting it?

Maybe that's a very bad idea.
Harald
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 6 in “stash: allow custom conflict labels for pop”
  1. stash: allow custom conflict labels for popHarald Nordgren via GitGitGadget, Sep 30, 2026
  2. Junio C HamanoSep 30, 2026
  3. Phillip WoodOct 1, 2026
  4. Junio C HamanoOct 1, 2026
  5. Harald NordgrenOct 2, 2026
  6. Junio C HamanoOct 2, 2026

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.