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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 2, 2026, 14:31 UTC
Message-ID
<xmqqwls018ee.fsf@gitster.g>
In-Reply-To
<CAHwyqnWQUHi3d8HKBAWzEgHoGwqSRfUnMy4jkVT-m2NWwnEizQ@mail.gmail.com>
Harald Nordgren <haraldnordgren@gmail.com> writes:
> Would be interesting to remove it from 'apply' too. Can we "hide" it
> by keeping it but just not documenting it?

If we rewrote the in-tree caller that spawns 'git stash apply' as a separate subprocess via the run_command() interface, and instead implemented the feature as a function call, the need to "hide" it would disappear. With the possibility for such a real improvement in the future in mind, labelling them as "for internal use only, do not use, as it may disappear in the future" might have some merit as a short-term measure.

Thanks.
Previous: Harald Nordgren
Message 6 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.