From: Junio C Hamano <gitster@pobox.com>
To: Harald Nordgren <haraldnordgren@gmail.com>
Cc: Harald Nordgren via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH] stash: allow custom conflict labels for pop
Date: Fri, 02 Oct 2026 07:31:21 -0700 [thread overview]
Message-ID: <xmqqwls018ee.fsf@gitster.g> (raw)
In-Reply-To: <CAHwyqnWQUHi3d8HKBAWzEgHoGwqSRfUnMy4jkVT-m2NWwnEizQ@mail.gmail.com> (Harald Nordgren's message of "Fri, 2 Oct 2026 09:21:26 +0200")
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.
prev parent reply other threads:[~2026-10-02 14:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-30 20:58 [PATCH] stash: allow custom conflict labels for pop Harald Nordgren via GitGitGadget
2026-09-30 21:33 ` Junio C Hamano
2026-10-01 9:47 ` Phillip Wood
2026-10-01 17:58 ` Junio C Hamano
2026-10-02 7:21 ` Harald Nordgren
2026-10-02 14:31 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwls018ee.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=haraldnordgren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.