From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-a5-smtp.messagingengine.com (fout-a5-smtp.messagingengine.com [103.168.172.148]) (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 9E4302FE053 for ; Wed, 10 Dec 2025 11:56:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.148 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765367781; cv=none; b=Thy6hHIMmOg/26Ghkcx3RxO/TGKCxt9rcHWtSg1nB6HtS+g93B9jNWO1Lz/ZA4X5SL+GCz4WdQUFroMfg3OiTbxT3X1bl9zXeQwo9dFhnEYYdkaoWP1ukiss+mLnEOZhOrc9nOuFu2wLcfQMP2leBFmIjdedHG66uMRe/9s+Juw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765367781; c=relaxed/simple; bh=rSCuk1IltqF7R3MKHGNva1ZIaBtDJZqORtFSTGBDILs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=TNGT5ULAiOZ1AUTZysR37HG/tNnLwbZxAzoTwk8PsrlbbRfGm3saXxe7/hB6WCykrKqYCANN7Uj0ds3LLFBMVjai5QqUx7uF6acW9ulm9/ZbsQNIAHU2tosUXOlRCrHfxYlVvtjknrrFeZR3NIcuvdhyQuMlR8QHKxrEHQulPO8= 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=Akv963Ng; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=yZXyAfCP; arc=none smtp.client-ip=103.168.172.148 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="Akv963Ng"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="yZXyAfCP" Received: from phl-compute-07.internal (phl-compute-07.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id 9A0BFEC009D; Wed, 10 Dec 2025 06:56:17 -0500 (EST) Received: from phl-frontend-02 ([10.202.2.161]) by phl-compute-07.internal (MEProxy); Wed, 10 Dec 2025 06:56:17 -0500 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=fm3; t=1765367777; x=1765454177; bh=465I58nKCf 13eH0NsBm6cWHlmEzjR5zNBc9ok/Xz1sM=; b=Akv963NgYcp287h3tMkuKsU4Hb MBcwbqE5Xnv/+lT+ycIJh8MmYkKGNyDvCBfs1m0gnSqFN4qc0vQVKBXtLYe6O0Xp WbYwaMD4frJoehWD0w54rnHsU3SmgtMjqukCH5W9pKuJmnO8kgl6kQfyAzaB7Ddn LXmtgWQTUNUz7aIIqExCkBoSSyhu78YSbP8hGxFMC15uM85TxELuPirqD4PD435/ nxcURp+R1aqOyDArh3av+XveAy3wjQ/+HBrbkMtOwXFmNlujLFNzdc4CBMOhLlEo vKoC9lwBxxx4d0mCmgdLyvvq/DPqHkQw6c64q4FXkBY4vk7aDk1L5UUn5d3g== 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=fm1; t= 1765367777; x=1765454177; bh=465I58nKCf13eH0NsBm6cWHlmEzjR5zNBc9 ok/Xz1sM=; b=yZXyAfCPZx1XzkS7cSXwY2jS4xb5cwPlEcD8lSVvZwhVjsY+jON ElDo+woNcBCFVu4VneTvtkIRWEiUWW4gUldnvx/ZwFQFDMSO96+gjKIkorS6sv3d DR5CXtPDbegOKoZncsRJJeuvsHMGa+f752BSFqfrHlNHy75oLgrs/m4hMtLi2hlM ib+VjXqJMbagkVVd/4+kAGbT5M+wONG1oJbQHBk1kNzJiOgaBlM8XJ8x81muo/oG 70yHSqMdAdPykjIvfXJJFuU1EkLF/5h5ddMIfozfRRk24Gb++H9NW5Dm2Tzi+Tu8 uPuNkyPExmy2tgw5oWqa+jnd7+mz+FdLhcg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddvvdefiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufgjfhffkfgfgggtsehttdertddtredtnecuhfhrohhmpefluhhnihhoucev ucfjrghmrghnohcuoehgihhtshhtvghrsehpohgsohigrdgtohhmqeenucggtffrrghtth gvrhhnpeefveetteejheeugeffledvteeiveffueefjeelueffteeigffgfedthfefieeg ieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgih htshhtvghrsehpohgsohigrdgtohhmpdhnsggprhgtphhtthhopedutddpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepphhhihhllhhiphdrfihoohguuddvfeesghhmrghilh drtghomhdprhgtphhtthhopegtohguvgeskhhhrghughhssggrkhhkrdhnrghmvgdprhgt phhtthhopehphhhilhhlihhprdifohhougesughunhgvlhhmrdhorhhgrdhukhdprhgtph htthhopehkrhhishhtohhffhgvrhhhrghughhssggrkhhksehfrghsthhmrghilhdrtgho mhdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtoh eptghhrhhishhtihgrnhdrtghouhguvghrsehgmhgrihhlrdgtohhmpdhrtghpthhtohep nhgvfihrvghnsehgmhgrihhlrdgtohhmpdhrtghpthhtohepshhiugguhhgrrhhthhgrsh hthhgrnhgrfedusehgmhgrihhlrdgtohhmpdhrtghpthhtohepthhoohhnsehiohhttghl rdgtohhm X-ME-Proxy: Feedback-ID: if26b431b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 10 Dec 2025 06:56:16 -0500 (EST) From: Junio C Hamano To: Phillip Wood Cc: Kristoffer Haugsbakk , Phillip Wood , Kristoffer Haugsbakk , git@vger.kernel.org, Christian Couder , Elijah Newren , Siddharth Asthana , Toon Claes Subject: Re: [PATCH 0/3] doc: replay: improvements like "mention no output on conflicts" In-Reply-To: <74a705b5-bafe-4304-86ea-fd3873ae4fb4@gmail.com> (Phillip Wood's message of "Wed, 10 Dec 2025 09:51:21 +0000") References: <7d0201aa-905c-4da2-932d-47666c923875@gmail.com> <202f7015-1e7f-493e-bd82-474e5cefdf01@app.fastmail.com> <74a705b5-bafe-4304-86ea-fd3873ae4fb4@gmail.com> Date: Wed, 10 Dec 2025 20:56:14 +0900 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 Phillip Wood writes: > We do talk about "branch heads" in our documentation and they point > commits. We also use "tip" when talking about the commit the branch > points to so maybe something like > > Update all branches whose tip is replayed > > though I think it would be clearer if we could say "commit" somewhere as > that's what we're replaying. I find the concept of "contained branches" > rather obscure. Thanks, I do agree that "branch head", "tip of the branch", etc. can be used pretty much interchangeably, and using "commit" somwhere would make it clear. Update all branches that point at commits in the replayed . perhaps? I dunno.