From: Harald Nordgren via GitGitGadget Date: Wed, 30 Sep 2026 20:58:49 GMT Subject: [PATCH] stash: allow custom conflict labels for pop Message-ID: From: Harald Nordgren Since 13817db274 (stash: add --label-ours, --label-theirs, --label-base for apply, 2026-04-28), "git stash apply" accepts custom labels for conflict markers, but "git stash pop" does not, although it applies the entry the same way and only differs by dropping it afterward. A caller that wants its own labels has to use apply and drop the entry itself. Teach "git stash pop" the same three options. Signed-off-by: Harald Nordgren --- stash: allow custom conflict labels for pop git stash pop now accepts the conflict label options that git stash apply gained in 2.55. Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2430%2FHaraldNordgren%2Fstash-pop-labels-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2430/HaraldNordgren/stash-pop-labels-v1 Pull-Request: https://github.com/git/git/pull/2430 Documentation/git-stash.adoc | 4 ++-- builtin/stash.c | 11 +++++++++-- t/t3903-stash.sh | 23 +++++++++++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/Documentation/git-stash.adoc b/Documentation/git-stash.adoc index fc6a9a008c..187b1a50d3 100644 --- a/Documentation/git-stash.adoc +++ b/Documentation/git-stash.adoc @@ -11,7 +11,7 @@ SYNOPSIS git stash list [] git stash show [-u | --include-untracked | --only-untracked] [] [] git stash drop [-q | --quiet] [] -git stash pop [--index] [-q | --quiet] [] +git stash pop [--index] [-q | --quiet] [--label-ours=