From patchwork Wed Feb 7 21:44:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junio C Hamano X-Patchwork-Id: 13549096 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) (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 87AE91386C5 for ; Wed, 7 Feb 2024 21:44:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=173.228.157.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707342288; cv=none; b=XIaziIyxWdVLj6cHkNXUnXH41J8nux7ymMfBIt/Cc3uf1IUudp4wyIkxvvkc6RApRqOJtvrhRQQCb2MdZ1l9SKHxi/hEf9wlRzaRXCuIFG6TMs0mrpsCr1Ivq1yKbDbK1rMqcLpQznmZ5rNmBKSeuWPidsxN/NBc4eIkhOlDL4I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707342288; c=relaxed/simple; bh=x7hGd3RclxS8BOazHCIXNS79l0lXRtFXnDixY6WfK5U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bEOX1aI5kKU2RmrpzzJlfGt5tisi4pV9v+CINRT0bwVr6SEZYtPkVYjzzsYxBrdMp1MvbD7F2m0rVk48myWEKtE+5HvZUdVhSFrAddzbz257pk3eLfnWsjxMjmfuy7/GJ6/vshcTlqUeJTX3UPFRlscYdZ3UZAsB3UuVvoSOa0w= 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 (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=j+lKRpJE; arc=none smtp.client-ip=173.228.157.52 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 (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="j+lKRpJE" Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 380612F1C6; Wed, 7 Feb 2024 16:44:46 -0500 (EST) (envelope-from gitster@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=x7hGd3RclxS8BOazHCIXNS79l 0lXRtFXnDixY6WfK5U=; b=j+lKRpJEi9Xy1pMw9wQsNAkcu9Kz6PQ+vW5tcbZqW jOtcMzWNo13S/m9L8FCWqH+YHjpdb6OyBV3wWqunJiZ8Er5xcrf0FduSaSH9bvDx KZT9r1QCpdl/hCkRiHNBO+BndMDVSAC4bh11/FjO0CAk47i3vSAM+6JnsVv4AUFT cs= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 31E782F1C5; Wed, 7 Feb 2024 16:44:46 -0500 (EST) (envelope-from gitster@pobox.com) Received: from pobox.com (unknown [34.125.165.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id C72342F1C1; Wed, 7 Feb 2024 16:44:41 -0500 (EST) (envelope-from gitster@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Cc: Matthieu Moy Subject: [PATCH 1/2] bisect: document "terms" subcommand more fully Date: Wed, 7 Feb 2024 13:44:35 -0800 Message-ID: <20240207214436.538586-2-gitster@pobox.com> X-Mailer: git-send-email 2.43.0-561-g235986be82 In-Reply-To: <20240207214436.538586-1-gitster@pobox.com> References: <24a42fa6-7bc4-4a3b-8bf4-a0ef85dc457a@matthieu-moy.fr> <20240207214436.538586-1-gitster@pobox.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Pobox-Relay-ID: 19B0D890-C602-11EE-8DAD-F515D2CDFF5E-77302942!pb-smtp20.pobox.com The documentation for "git bisect terms", although it did not hide any information, was a bit incomplete and forced readers to fill in the blanks to get the complete picture. Acked-by: Matthieu Moy Signed-off-by: Junio C Hamano --- Documentation/git-bisect.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index fbb39fbdf5..3d813f9c77 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -20,7 +20,7 @@ on the subcommand: [--no-checkout] [--first-parent] [ [...]] [--] [...] git bisect (bad|new|) [] git bisect (good|old|) [...] - git bisect terms [--term-good | --term-bad] + git bisect terms [--term-(good|old) | --term-(bad|new)] git bisect skip [(|)...] git bisect reset [] git bisect (visualize|view) @@ -165,8 +165,10 @@ To get a reminder of the currently used terms, use git bisect terms ------------------------------------------------ -You can get just the old (respectively new) term with `git bisect terms ---term-old` or `git bisect terms --term-good`. +You can get just the old term with `git bisect terms --term-old` +or `git bisect terms --term-good`; `git bisect terms --term-new` +and `git bisect terms --term-bad` can be used to learn how to call +the commits more recent than the sought change. If you would like to use your own terms instead of "bad"/"good" or "new"/"old", you can choose any names you like (except existing bisect From patchwork Wed Feb 7 21:44:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junio C Hamano X-Patchwork-Id: 13549097 Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) (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 A9B2D13A244 for ; Wed, 7 Feb 2024 21:44:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=173.228.157.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707342293; cv=none; b=Yq1bbR7XckkPRNjwl2zOPBl0LSahuUoGVmuA6YKX9HR5jEhxHDa8AQs9jsFxBTMdVXJi2kkT07ggYD5xGy25IiZ0Idwls6uUqWHAbEC/IwV+emsDVKp2fe9k011Fxx6AwYATf93H1D0z2/K8Z4Z8EWay/tWke+hwrBR/b5h4WYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707342293; c=relaxed/simple; bh=VkVU8bZIupGREFb6UOOGQIhb5u+sScx6bTcHAUtHGpg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qlCh0e/Lxk7VY+w/bmbJ8jIAoJSwQej+Q4cqJkIypEw3UT7pDKujaXl1ewTNG1KDYGsAk2nn0k/LF1rWIKvyspclN0D8DN9avysfCpQEvwHtcsnHGnt+6Cfw8LeTMxzloC/F7A+0Fy/VBkJ2YEClVmCMUntQqxiM7ik8O+OEcMo= 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 (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=gSKF+Au4; arc=none smtp.client-ip=173.228.157.53 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 (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="gSKF+Au4" Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 0F5AF2BD3C; Wed, 7 Feb 2024 16:44:51 -0500 (EST) (envelope-from gitster@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=VkVU8bZIupGREFb6UOOGQIhb5 u+sScx6bTcHAUtHGpg=; b=gSKF+Au4vKtA0s/dudVT8ShtxB8mm7becG6MDoocV Yo0SvFlJv2qntlrco9jfiDBmZTH7rLj3DHye6WLl99yg3iNm6ofcBtAfVXaEcZLd cnERi0nc099idXliOxPqp4kBAQ2amFxS8PECKZE9cF+xHIZ/oRNy3PeN3CXBYKzP lE= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 0735A2BD3B; Wed, 7 Feb 2024 16:44:51 -0500 (EST) (envelope-from gitster@pobox.com) Received: from pobox.com (unknown [34.125.165.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 967D02BD39; Wed, 7 Feb 2024 16:44:46 -0500 (EST) (envelope-from gitster@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Cc: Matthieu Moy Subject: [PATCH 2/2] bisect: document command line arguments for "bisect start" Date: Wed, 7 Feb 2024 13:44:36 -0800 Message-ID: <20240207214436.538586-3-gitster@pobox.com> X-Mailer: git-send-email 2.43.0-561-g235986be82 In-Reply-To: <20240207214436.538586-1-gitster@pobox.com> References: <24a42fa6-7bc4-4a3b-8bf4-a0ef85dc457a@matthieu-moy.fr> <20240207214436.538586-1-gitster@pobox.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Pobox-Relay-ID: 1C8D2CE4-C602-11EE-8219-A19503B9AAD1-77302942!pb-smtp21.pobox.com The syntax commonly used for alternatives is --opt-(a|b), not --opt-{a,b}. List bad/new and good/old consistently in this order, to be consistent with the description for "git bisect terms". Clarify to either or to make them consistent with the description of "git bisect (good|bad)" subcommands. Suggested-by: Matthieu Moy Signed-off-by: Junio C Hamano --- Documentation/git-bisect.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 3d813f9c77..73f889b97b 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -16,7 +16,7 @@ DESCRIPTION The command takes various subcommands, and different options depending on the subcommand: - git bisect start [--term-{new,bad}= --term-{old,good}=] + git bisect start [--term-(bad|new)= --term-(good|old)=] [--no-checkout] [--first-parent] [ [...]] [--] [...] git bisect (bad|new|) [] git bisect (good|old|) [...]