From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-a4-smtp.messagingengine.com (fout-a4-smtp.messagingengine.com [103.168.172.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCCEA3B8BBB for ; Thu, 9 Apr 2026 17:25:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.147 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775755561; cv=none; b=twT7qphmwYEyu1WC8r0mHIOXCjoBOpwD0OLHkmRA5LGBbBVGnww8AM+cJdoINTdM/ArMCkgR77NtIZJPcgDyrtaIuWjg6vO3rhxGCeP1/Q5vyFJBYZmYYL0nDDuQ5AvAaDkn1i495Ow/rQLxl7XbktjsgprV6Eo0B8/nOiRDY48= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775755561; c=relaxed/simple; bh=/9x4crskL1LlP7aImg63ywi5LjIvobE/yB9aeT80vRg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=AdwhAx79Id6O7zZsWHU3vDsRkz6+kNbk8+GkUNKDvVgqFLuEuZ7GRTl7HsEHxuTAK5RpJR1OZGjnbMRY50e/Yz5qOn4r8/bnDLkglEQGHFaftrODi4unJv0JHQbMiMIOYmjYeECFddaEalIsJ4y4M7Hf1Lgpy9PMQbaPxKQI3Z8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b=MF0Q4Io0; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=S+s9LuUu; arc=none smtp.client-ip=103.168.172.147 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b="MF0Q4Io0"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="S+s9LuUu" Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id D2ECEEC0426; Thu, 9 Apr 2026 13:25:56 -0400 (EDT) Received: from phl-frontend-02 ([10.202.2.161]) by phl-compute-03.internal (MEProxy); Thu, 09 Apr 2026 13:25:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pobox.com; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm1; t=1775755556; x=1775841956; bh=Mzr+SJEn54 06e1qGTzFAniGPfehsjPm/dlYf+2uyNgg=; b=MF0Q4Io05zqXo/9aMXEQ0+z796 3UygVqYluvkww8lwywoa0phuMpbUdycLLMdfcCHzsfubNDKrknRP3tIs5g0Dvud+ AaEWzyvNvLzisY5p0xi8EM8CSu/Hsiql8wpSOqzrGQXV5O6N+LoaAqHakowwnV6h TDhvl7ENjRjr5FBSZC61CkwXXmR3Uzf04DiqLkR2TgSQ7Hi06Sf7HyJ8gktuE+iJ 6GBF2/igomX8fyn7bt+5TpDFWd6v2jWpjxIR/sYliAo4Y1eO6AIFDBk9Z1MWVsgO kXseicks9k4Exl6hcfumQF+WrG1VbR9IdrWy/M5hjLrH1ENRGqkgFM60DTbw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1775755556; x=1775841956; bh=Mzr+SJEn5406e1qGTzFAniGPfehsjPm/dlY f+2uyNgg=; b=S+s9LuUu/VjBHOP9wqUvMOqZLUkyKZoW5V8NQ8CY9IZbtrSACjk sIsTrCzzc0bwNXNjxRAEo/PQkmjy9/JC54/xeqSeWDIF7N0nxORSsgVdpezKkNpg HbQPNo0CEfyKwvrJwwBhm1ng6s9Ex9KaDT1qGYwvy9EkvJ3ciM+rOwMZSwKUZRbp 0JxsESEmiW6glmXpdoEmWz7puKjlaHfyMQFLPmBj4Xd7zRYaNFG1+N7xG8K7aFKi YrmRMNDdTxjruGje5136k4k8QlQrNaG48pcfm1ISfShHDG2ymPrrhZZfrU5db3cK b5vsIdQR6iyuRDUwMIFoAZGuBaM+j14db5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgddvjedtlecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufgjfhffkfgfgggtsehttdertddtredtnecuhfhrohhmpefluhhnihhoucev ucfjrghmrghnohcuoehgihhtshhtvghrsehpohgsohigrdgtohhmqeenucggtffrrghtth gvrhhnpeefveetteejheeugeffledvteeiveffueefjeelueffteeigffgfedthfefieeg ieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgih htshhtvghrsehpohgsohigrdgtohhmpdhnsggprhgtphhtthhopeehpdhmohguvgepshhm thhpohhuthdprhgtphhtthhopehgihhtghhithhgrggughgvthesghhmrghilhdrtghomh dprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohep phhhihhllhhiphdrfihoohguuddvfeesghhmrghilhdrtghomhdprhgtphhtthhopehhrg hrrghlughnohhrughgrhgvnhesghhmrghilhdrtghomhdprhgtphhtthhopehgihhtshht vghrsehpohgsohigrdgtohhm X-ME-Proxy: Feedback-ID: if26b431b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Apr 2026 13:25:56 -0400 (EDT) From: Junio C Hamano To: "Harald Nordgren via GitGitGadget" Cc: git@vger.kernel.org, Phillip Wood , Harald Nordgren Subject: Re: [PATCH v7 1/4] stash: add --ours-label, --theirs-label, --base-label for apply In-Reply-To: <284075600aeb1fc2711be72ca201de3efd81e365.1775741265.git.gitgitgadget@gmail.com> (Harald Nordgren via GitGitGadget's message of "Thu, 09 Apr 2026 13:27:42 +0000") References: <284075600aeb1fc2711be72ca201de3efd81e365.1775741265.git.gitgitgadget@gmail.com> Date: Thu, 09 Apr 2026 10:25:55 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain "Harald Nordgren via GitGitGadget" writes: > From: Harald Nordgren > > Allow callers of "git stash apply" to pass custom labels for conflict > markers instead of the default "Updated upstream" and "Stashed changes". > Document the new options and add a test. > > Signed-off-by: Harald Nordgren > --- > Documentation/git-stash.adoc | 11 ++++++++++- > builtin/stash.c | 2 +- > t/t3903-stash.sh | 18 ++++++++++++++++++ > 3 files changed, 29 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-stash.adoc b/Documentation/git-stash.adoc > index b05c990ecd..6829ba1140 100644 > --- a/Documentation/git-stash.adoc > +++ b/Documentation/git-stash.adoc > @@ -12,7 +12,7 @@ git stash list [] > git stash show [-u | --include-untracked | --only-untracked] [] [] > git stash drop [-q | --quiet] [] > git stash pop [--index] [-q | --quiet] [] > -git stash apply [--index] [-q | --quiet] [] > +git stash apply [--index] [-q | --quiet] [--ours-label=