From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-b6-smtp.messagingengine.com (fout-b6-smtp.messagingengine.com [202.12.124.149]) (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 D6FD8201266 for ; Wed, 6 Aug 2025 05:54:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.149 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754459671; cv=none; b=pLdKNj4O44GoQzOi+xtxdYbC22aXkWAPPBlylDP+oSpowHMfTtM/iQgaCDXcdYARCoAHhm/3NTdy9HtmEgXHmdaZEpx56qm64v2WEL5u+C1le0lAQZBCeTG0ARNGK0ilmXHW+jRpyiOFcmLNxuCPuN2Ecv4tVXmlBJN5SNo2l2k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754459671; c=relaxed/simple; bh=NMlHKrumL+ng9rFGuBdnqcrH8cU8jdXOLDH/OFJpU9w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A3qs5YZPc2GKfulux2Ygac0RJ5fA+AwWkVCXjga1f/LGeroewO6U4QnG8lvaydoFVr4qvU++PKzkPhEmmdofvtxoqC2+1Gg7gX4wsQ3ADvBX/ECvc4R+uYA0CopMIbYzxLPJzkrVfRFx0BZTf2cPP7ujS6nkmwIsaoFh7yCemU4= 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=My47plLv; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=lvwQ/69z; arc=none smtp.client-ip=202.12.124.149 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="My47plLv"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="lvwQ/69z" Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfout.stl.internal (Postfix) with ESMTP id A791B1D000F9; Wed, 6 Aug 2025 01:54:28 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Wed, 06 Aug 2025 01:54:28 -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=1754459668; x=1754546068; bh=PloBno4xWCs5xaT96hP90XBVMD33cml107eI5bQwe3g=; b= My47plLvQr3xDFEh2UhyeXSupi0exNc8HrEvwBvdkvkuXWHCyCUCxLaEQKZtFxW+ MWF371Xa0crYdJebOFFlB/1gYVROHeu20nzRBxylpIEysNs6mXDzZTamjMCFypk2 EZjDm16wzROLCWr8mZ+3g2Zf9kGjIe3k6jItNRFQQ8rm8nsdV9YMchVgsphyXaxC S3m4ATR+uzjTf7Hg3wNsPtalUu7CFUxdOZBqqlddZH+kL6ojcOoh1wocG/opqsOX hsBa62j2Iiy6cc4EKtO0FmjsHBDx3cF/AvmawQt8YQKV24LOAnlB/uGLVIoJP1ra e6qfcm90GUFg2jVlSbeqHw== 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=1754459668; x= 1754546068; bh=PloBno4xWCs5xaT96hP90XBVMD33cml107eI5bQwe3g=; b=l vwQ/69zuWBzQIcga0j9fLXJQ1eWYwpR5+FExsUlF1HJV9VhdHsrbWDgF9xd5VCoP rlPCMuXz5Jz4cozaR7KNAuKvsVg62bjhTFEDv+BUscYQuEW61WaZi9qACupNJKED 6YL/CieXMxndfFvftVDl21SRxO7LW7YwgWTC70czmzu0Ihj+Cebjoi5BBJ4gaPFo 0uQnc5vHafpj9dt6H4UwFDT7d55VL/XPnNheDdyLw0nYbzQepuMvxyes/gJ/dTwb pvey/5RNi7BE+UhXG/osueyjkfy9QPnEYB8GMs2tC45HveIG9ZaQKyvBegQKwjCc z5jyQeC3jLA+lXKEPIC6Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdduudejvdeiucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeffueeiudejvdekheeuvdekfeffiedvueelteekudehjeetkeegvddugfdtgfeileen ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesph hkshdrihhmpdhnsggprhgtphhtthhopedutddpmhhouggvpehsmhhtphhouhhtpdhrtghp thhtohepphgvfhhfsehpvghffhdrnhgvthdprhgtphhtthhopegsvghnrdhknhhosghlvg esghhmrghilhdrtghomhdprhgtphhtthhopehtohhonhesihhothgtlhdrtghomhdprhgt phhtthhopehkrghrthhhihhkrddukeeksehgmhgrihhlrdgtohhmpdhrtghpthhtohepsh iivgguvghrrdguvghvsehgmhgrihhlrdgtohhmpdhrtghpthhtohepjhhnrdgrvhhilhgr sehfrhgvvgdrfhhrpdhrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrgh dprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpdhrtghpthhtohepjhhl thhosghlvghrsehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 6 Aug 2025 01:54:26 -0400 (EDT) Received: by mail (OpenSMTPD) with ESMTPSA id f651da4f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 6 Aug 2025 05:54:26 +0000 (UTC) From: Patrick Steinhardt Date: Wed, 06 Aug 2025 07:54:13 +0200 Subject: [PATCH v6 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: <20250806-pks-reflog-append-v6-2-a50839653766@pks.im> References: <20250806-pks-reflog-append-v6-0-a50839653766@pks.im> In-Reply-To: <20250806-pks-reflog-append-v6-0-a50839653766@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 , =?utf-8?q?Jean-No=C3=ABl_AVILA?= 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 0d6601fdea..4eb6c25607 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=