From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) (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 8DED73E1D07 for ; Thu, 9 Apr 2026 17:00:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.155 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754033; cv=none; b=jG/7yx+Con1mP8QXM1dQhfl54OJqmKYqMcK8LAPC6YJGVNYuv50l0WVid19rcua3aMvKJjsHe9M1hlb/WKMSmayuTKMVOW2DcT495Slg+rd+Xy5JhFZc7RJEJPwAJBS3+DttQqSh8S7lNajvbRdTm5tKwu5WvgNhUf7CVeNQxAo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754033; c=relaxed/simple; bh=X8l9TBENAdGfspN1WN1lmgVYeoqZh/YTVOEvKZv2+tM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=BgeWg1oK6UJrDbYy+1eKa7IyvgtraByXcgw0Ja+JI6JHC0OsRvQc5FpAsRv6r+NEPkLSERNoHaihOqeucg35XqG3vIqbB8LbdwBWrKur5Ztr6qXg5K6enxfUIe3vw2c/M+bAPjR4UexvjkkiPOobgdbCx6wLENfbFMsysiFBJJ8= 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=kzScj9rR; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=fV9b21BM; arc=none smtp.client-ip=103.168.172.155 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="kzScj9rR"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="fV9b21BM" Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id B35671400284; Thu, 9 Apr 2026 13:00:30 -0400 (EDT) Received: from phl-frontend-01 ([10.202.2.160]) by phl-compute-03.internal (MEProxy); Thu, 09 Apr 2026 13:00:30 -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=1775754030; x=1775840430; bh=eM/LoJlbXt T5378BbmdYtKSBoBEgp6NG8xnjMLhE+/4=; b=kzScj9rRIdhczsRbiL0Xu60lhk 0M/2XFo+T+ejpef0QsLBLkBz6hlbGExrmQaMH/c/Y2XiiltRUk/RoBPoDZwcYGw1 pP3ed5VIQ7K+vbV93S562fA7mQmX1Pn819B26CY5wvQsmTNngnn2/eJ9PIJbzddF yLj7RJFkD7jpVsgUlHoM4NlClG44Utkb195cTqclzGKEIWaV2H2SZg5TewkXU5SJ /7KLKXL5gk1AGpqIPEgWkiHwuURQjf1fF1eFavaPCu3o9//gyVszNXh4X1UZXPMU h3VPp790FRIzVtAt1yXS4L2bd3tZQDhA+BiAV6UsjOr9Cw3LCAfAZU6an04g== 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= 1775754030; x=1775840430; bh=eM/LoJlbXtT5378BbmdYtKSBoBEgp6NG8xn jMLhE+/4=; b=fV9b21BMv8JcWybbo7RshEoxd6b7R7YUYD7uzZQXQN/U3EzDnBZ IXfB3SUhrla/DPg813UEBLEx6HYaPWYMo8lr7IeU1/4vD4OSafaInwn0x326Z8i7 DLd2mqsQMlkgxZ+iwxoXNCIkgu5v1huEtXSjvxa8KECbaWpURX7zBmoYWyZ1ZQ1m yc3hHZ7uXWsEs3CquGQ3Hq/SjQZB29JnzVFJqI4GxcxwwtNRu1xF3P/9Fmhv67gl fe8e1BGhXBIiFkEHkMwDktUr04r78y8navHIU4waG0AKpQDrQ087moJD5F8x6xQP Zo9iREzcZI83x3V7P2jFkMz0AZ6IQQqUMMw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgddvjedtfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufgjfhffkfgfgggtsehttdertddtredtnecuhfhrohhmpefluhhnihhoucev ucfjrghmrghnohcuoehgihhtshhtvghrsehpohgsohigrdgtohhmqeenucggtffrrghtth gvrhhnpeffieetueejveefheduvdejudffieejgeefhfdtvdekfeejjeehtdegfefgieej tdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepghhithhsthgvrhesphhosghogidrtghomhdp nhgspghrtghpthhtohephedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhith hgihhtghgrughgvghtsehgmhgrihhlrdgtohhmpdhrtghpthhtohepghhithesvhhgvghr rdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehphhhilhhlihhprdifohhougduvdefse hgmhgrihhlrdgtohhmpdhrtghpthhtohephhgrrhgrlhgunhhorhgughhrvghnsehgmhgr ihhlrdgtohhmpdhrtghpthhtohepghhithhsthgvrhesphhosghogidrtghomh X-ME-Proxy: Feedback-ID: if26b431b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Apr 2026 13:00:30 -0400 (EDT) From: Junio C Hamano To: "Harald Nordgren via GitGitGadget" Cc: git@vger.kernel.org, Phillip Wood , Harald Nordgren Subject: Re: [PATCH v7 0/4] checkout: 'autostash' for branch switching In-Reply-To: (Harald Nordgren via GitGitGadget's message of "Thu, 09 Apr 2026 13:27:41 +0000") References: Date: Thu, 09 Apr 2026 10:00:28 -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: > Harald Nordgren (4): > stash: add --ours-label, --theirs-label, --base-label for apply > sequencer: allow create_autostash to run silently > sequencer: teach autostash apply to take optional conflict marker > labels > checkout: -m (--merge) uses autostash when switching branches Thanks for an update. Above the list of the commits, it would be helpful to give a summary of the overall goal of the topic (which typically stays more or less the same during the life of the topic) and the highlights of the changes since the previous iteration (which authors often accumulate, so that in a cover letter for v7, there will be 6 such summaries), if you are sending a cover letter. I _think_ the change since v6 is a rebasing onto a more recent 'master', and addition of a new test? Thanks. > Documentation/git-checkout.adoc | 58 +++++----- > Documentation/git-stash.adoc | 11 +- > Documentation/git-switch.adoc | 27 ++--- > builtin/checkout.c | 138 ++++++++++------------- > builtin/stash.c | 32 ++++-- > sequencer.c | 67 +++++++++--- > sequencer.h | 4 + > t/t3420-rebase-autostash.sh | 24 +++- > t/t3903-stash.sh | 18 +++ > t/t7201-co.sh | 188 ++++++++++++++++++++++++++++++++ > t/t7600-merge.sh | 2 +- > xdiff-interface.c | 12 ++ > xdiff-interface.h | 1 + > 13 files changed, 431 insertions(+), 151 deletions(-) > > > base-commit: b15384c06f77bc2d34d0d3623a8a58218313a561 > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2234%2FHaraldNordgren%2Fcheckout_autostash-v7 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2234/HaraldNordgren/checkout_autostash-v7 > Pull-Request: https://github.com/git/git/pull/2234 > > Range-diff vs v6: > > 1: cd9c64ba60 ! 1: 284075600a stash: add --ours-label, --theirs-label, --base-label for apply > @@ Documentation/git-stash.adoc: git stash list [] > -git stash apply [--index] [-q | --quiet] [] > +git stash apply [--index] [-q | --quiet] [--ours-label=