From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-b3-smtp.messagingengine.com (fout-b3-smtp.messagingengine.com [202.12.124.146]) (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 340C02749E0 for ; Tue, 29 Jul 2025 08:55:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.146 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753779339; cv=none; b=nNGoS9JTQRjnTqKtZ5rvQy7SEx3sHNlEDRYfdL9EltL/Je5M55lOxDP+1S4504sHpAy5fpZXy9zTT5GN22ANiBTmGMkNyi35g1OzQ8crKTtJOZY7V/swb9sW7sonclvTkbVYC2pPJdE4xbIC8UdyTj9c07+ugj7VewxLQMF/u98= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753779339; c=relaxed/simple; bh=g2nHNGPaLycvqfZHoiE617KC9wL1g1k04ahQjTbPP5Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t7Td8P9BCOYFFGYfoEB0gB9XVbNv7xywsXkocBfGJvEvWHHoUtF2YailwlgPbmmzMevom1TuKvMdvai/UDR6V2CVMGyfiCQaFshaJv4Yqy6wkDwgTXR8ky9n9GfLjpBKq0qLGNLpSJYy5D4GOIIYmFQuAwESKWwsKn6IQ8HF3AM= 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=QQySUFGA; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Ddr7JeqF; arc=none smtp.client-ip=202.12.124.146 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="QQySUFGA"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Ddr7JeqF" Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfout.stl.internal (Postfix) with ESMTP id A02481D002E5; Tue, 29 Jul 2025 04:55:34 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Tue, 29 Jul 2025 04:55:35 -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=1753779334; x=1753865734; bh=R0bAJwcL0HMWX1ZBBIx1EpmQuio+kZ3ZG0UVFCWchJ0=; b= QQySUFGAGLdyT5+Ztd+JTk513l8ghgVWljL3aWraifFF0/pzGe7j5e/iX76FN82i ijmP/6Xpg9FsZQwkjNKQuQyv8rXKbwpPV4NHnhc2/J/McCaurSv71gM9RMQoo0pe aDCXPgFEcbUCOQGtZApDwNC2tYBiPaCL7eebtiiCqX+96l/ActHj8C/frQFrTgST B3DYtCoWoJuPoqqqGFGqXlXd10CJ6kl2U5Tj6bBmoDZeRAAm9f35Jva+0enCvls9 WZl7kxKBLB7tFTKdHXb67lCQWM84kEG3kKYRV3qKbOSgFdUl/2MN00wQ5PwRSYRt 6KT8aZaehetmTa7DoLefqQ== 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=1753779334; x= 1753865734; bh=R0bAJwcL0HMWX1ZBBIx1EpmQuio+kZ3ZG0UVFCWchJ0=; b=D dr7JeqFiHBXxp2Pzks32xVTNs6wmXVemtWcbANK9VrCbav5R8nQJFSsSU2ljbJlL YeStC+C//KoxMV/ow80PS9wnMeVhlut/UpSv20CwT4LCXaSvb1TPjwfQ/QmwcxiW 72sG/m15mI1oo6POigj5zZk3l8YAbTo786dSzqBzkBp2Zzg+WpaCZqFKCPWlYlzL erpy9E9Ub5x6ewLnFY+2cdtyQPAjph9IkNREVFLMvR/Itr5pimj43+ic0D6ZCPUB tK0+JFw0UQtpChX5PFywMa8jPOngj66GBRYeMuPuqZvLk9QVH9U4pkQzji+jAVlx C2Ve+DPEjxtWiILzp/v4A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdelgeeifecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgt khcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnh epffeuiedujedvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkh hsrdhimhdpnhgspghrtghpthhtohepledpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepkhhrihhsthhofhhfvghrhhgruhhgshgsrghkkhesfhgrshhtmhgrihhlrdgtohhmpd hrtghpthhtohepphgvfhhfsehpvghffhdrnhgvthdprhgtphhtthhopehtohhonhesihho thgtlhdrtghomhdprhgtphhtthhopehkrghrthhhihhkrddukeeksehgmhgrihhlrdgtoh hmpdhrtghpthhtohepsggvnhdrkhhnohgslhgvsehgmhgrihhlrdgtohhmpdhrtghpthht ohepjhhlthhosghlvghrsehgmhgrihhlrdgtohhmpdhrtghpthhtohepghhithhsthgvrh esphhosghogidrtghomhdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdho rhhgpdhrtghpthhtohepshiivgguvghrrdguvghvsehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 29 Jul 2025 04:55:32 -0400 (EDT) Received: by mail (OpenSMTPD) with ESMTPSA id f671e7a3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 29 Jul 2025 08:55:32 +0000 (UTC) From: Patrick Steinhardt Date: Tue, 29 Jul 2025 10:55:20 +0200 Subject: [PATCH v3 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: <20250729-pks-reflog-append-v3-2-9614d310f073@pks.im> References: <20250729-pks-reflog-append-v3-0-9614d310f073@pks.im> In-Reply-To: <20250729-pks-reflog-append-v3-0-9614d310f073@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 707a9b39edb..c3801b82fb6 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=