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 E2547279DCD for ; Tue, 5 Aug 2025 15:11:52 +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=1754406714; cv=none; b=n8UMSzngkjK0aouEpcUl7XV0gMAw7eijBOrTLASisRGt+bkWlooCjs9X94EtLll7EilcThvl5U8vFAIKkW1yWOPAtYA5zhp+upXLzoDaJ7yxxNLj6Bi9SqGWCmvQT5YjY74L2FhWt+QxbxxRdJj4vBp7WBhSkOvy3DxYKR8b2Ns= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754406714; c=relaxed/simple; bh=Hc11O7oG0nRH74yo2fzNLygCJa5qgWnS67d/Nk2zVaY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rips1OW80U1kSW7UXeZBACxeC5rASc9e+RKgd9Z0qBRgiqg0dCdZaJbtOTSnWH/+0DSBywnlSgjmwb6aTxcB1piEHfyQTATrgsQqV4TIUqjCzdtJ+e14HFUK/r+XB42Dg3XeBINP0JxCY088DC7jmYtGlnndXmwXRRWT9munOUI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=LDRvsAW1; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=hV3gyPGw; arc=none smtp.client-ip=103.168.172.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="LDRvsAW1"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="hV3gyPGw" Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id F12B3140004C; Tue, 5 Aug 2025 11:11:51 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Tue, 05 Aug 2025 11:11:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding: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=1754406711; x=1754493111; bh=unEgfeLs+zTBUArnihMrcWP1mZCFpRpWgWdPgmpfT8I=; b= LDRvsAW1oN1GxssoIwZlEFLi4zju3/rX7P7y7FRTCAlV6VLwrLaIyPVW/sKCTb5l 5h4FKaVADBNGlsUjKoWlebhNElZEdsbY/sacV/z1CYlX8gDLrI1N2+yGOvS7m5Ei zL7YFTHnRyVohvcc8eRst9pos1NA2a4PgQGbpxJrggdCV4cPnQ1E3NMl/WF3haBH yU0yWJkLhILtgG2iPLljEexjlApeB2XnFq5ASRuVxyJbjY3tBnQKcwng/dIooUFk /CP10sh6sGHTF4+cp5r+flm5jowOoj9MCrRYMkrmmM96IzyCpT3E5vlSMX/4aFsz IM/SdOqwe5Whak0JE1+lJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=fm3; t=1754406711; x= 1754493111; bh=unEgfeLs+zTBUArnihMrcWP1mZCFpRpWgWdPgmpfT8I=; b=h V3gyPGw3TXbOja3qRlmM7ThwZYX32G97EnRE2YUxcLd5uhAPyHw308Kv/cBwnycE Ibshrrqt8EeKBGdMpC/uwRkUCD3GaYUdBQrqg5nylcjq4slrdZwnJkV9zuyi4bkD UCMWcUZfd4YvVP5te/5l24j2VXcfpG8/K7tw+BdFfGHUhps59ncMLyIdTxGH0YRT wyNwysU1f5vYwbyb4qym8lL0SVKHhnLLg+lZvm46B+Mf3Yt0MTEZx0rslaQsE/uW t9HM176L02uhpauVAXgIAmCLpzZsqsDpkDAioFvdCrvUbrZ9xKYBqP0C9kE8iYRI gz3xhVr2fIASAMOmUxFZA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdduudehhedtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeffueeiudejvdekheeuvdekfeffiedvueelteekudehjeetkeegvddugfdtgfeileen ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesph hkshdrihhmpdhnsggprhgtphhtthhopeelpdhmohguvgepshhmthhpohhuthdprhgtphht thhopehsiigvuggvrhdruggvvhesghhmrghilhdrtghomhdprhgtphhtthhopehgihhtsh htvghrsehpohgsohigrdgtohhmpdhrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgv lhdrohhrghdprhgtphhtthhopehkrhhishhtohhffhgvrhhhrghughhssggrkhhksehfrg hsthhmrghilhdrtghomhdprhgtphhtthhopegsvghnrdhknhhosghlvgesghhmrghilhdr tghomhdprhgtphhtthhopehjlhhtohgslhgvrhesghhmrghilhdrtghomhdprhgtphhtth hopehtohhonhesihhothgtlhdrtghomhdprhgtphhtthhopehkrghrthhhihhkrddukeek sehgmhgrihhlrdgtohhmpdhrtghpthhtohepphgvfhhfsehpvghffhdrnhgvth X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 5 Aug 2025 11:11:50 -0400 (EDT) Received: by mail (OpenSMTPD) with ESMTPSA id bfced13e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 5 Aug 2025 15:11:49 +0000 (UTC) From: Patrick Steinhardt Date: Tue, 05 Aug 2025 17:11:32 +0200 Subject: [PATCH v5 2/9] builtin/reflog: improve grouping of subcommands Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250805-pks-reflog-append-v5-2-050997db09d5@pks.im> References: <20250805-pks-reflog-append-v5-0-050997db09d5@pks.im> In-Reply-To: <20250805-pks-reflog-append-v5-0-050997db09d5@pks.im> To: git@vger.kernel.org Cc: Karthik Nayak , Justin Tobler , Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= , Toon Claes , Jeff King , Kristoffer Haugsbakk , Ben Knoble X-Mailer: b4 0.14.2 The way subcommands of git-reflog(1) are laid out does not make any immediate sense. Reorder them such that read-only subcommands precede writing commands for a bit more structure. Furthermore, move the "expire" subcommand last. This prepares for a subsequent change where we are about to introduce a new "write" command to append reflog entries. Like this, the writing subcommands are ordered such that those affecting a single reflog come before those spanning across all reflogs. Signed-off-by: Patrick Steinhardt --- Documentation/git-reflog.adoc | 61 ++++++++++++++++++++++--------------------- builtin/reflog.c | 38 +++++++++++++-------------- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/Documentation/git-reflog.adoc b/Documentation/git-reflog.adoc index 707a9b39ed..c3801b82fb 100644 --- a/Documentation/git-reflog.adoc +++ b/Documentation/git-reflog.adoc @@ -11,13 +11,13 @@ SYNOPSIS [synopsis] git reflog [show] [] [] git reflog list -git reflog expire [--expire=