From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS54825 147.75.48.0/24 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [147.75.48.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 49DE61F44D for ; Mon, 18 Mar 2024 16:31:21 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=pobox.com header.i=@pobox.com header.a=rsa-sha256 header.s=sasl header.b=bhEQNpEA; dkim-atps=neutral Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 312D8B212B0 for ; Mon, 18 Mar 2024 16:31:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6ED2554BC7; Mon, 18 Mar 2024 16:31:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="bhEQNpEA" 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 DCB881367 for ; Mon, 18 Mar 2024 16:31:09 +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=1710779471; cv=none; b=YWy140UnuXWxm6r3vpiXmtZ0sEQolTBWSrVMyX5zLbEjoAbWUEjk9KFIw2R6UAxcP8LWsqn2WNW2a83VEZ+U9TdWbCbZ+bg4Ow4o+QqktSSTEMx7sZiYyrF+t43LmhlS7TTppw4hCbzPsiVxgUhotZsdAUUogSpDp+SwaddF+OI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710779471; c=relaxed/simple; bh=HYWxsFyO+bHuGu19BwWO64/Xy0HCe6lPxt1Njs6W7P4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=g8n9Rcos4NGSwz64VTGhyJE40RPSHZOFcQKjjB0VzNYv9vd0KRMy3ozK7bHCNq5AIVVhr9G2pCcml8GUa36LU7RIjvhk+jl9+ZUrqP0r5/Mj7HsDZmkiaMIxX3IsY2CaUrmY4rT74aswib6Wpdl4tXksdNzDsgV0ACdB43ooDqM= 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=bhEQNpEA; 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 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 6CFA52E266; Mon, 18 Mar 2024 12:31:09 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=HYWxsFyO+bHu Gu19BwWO64/Xy0HCe6lPxt1Njs6W7P4=; b=bhEQNpEAyVzcXUvrOnfGj8fxZ2LP OB0p7ya2aN18DtwriJkOhFIdaFtXZYdFtTdaTNInonlxzbKqG9QHlOVK61Uo1hVl e60Cz7+1hxS6tP9sMumc8XBbxuDSvnG0NA+DKOwMwJociDMyd7rMpo2dCE7aR2US npQOPJNucDAke6c= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 641382E265; Mon, 18 Mar 2024 12:31:09 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.125.185.65]) (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 0B0772E264; Mon, 18 Mar 2024 12:31:05 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: "Philippe Blain via GitGitGadget" Cc: git@vger.kernel.org, Elijah Newren , Phillip Wood , Johannes Schindelin , ZheNing Hu , Kristoffer Haugsbakk , =?utf-8?Q?Rub=C3=A9n?= Justo , Philippe Blain Subject: Re: [PATCH v3 0/2] Allow disabling advice shown after merge conflicts In-Reply-To: (Philippe Blain via GitGitGadget's message of "Sat, 16 Mar 2024 21:16:28 +0000") References: Date: Mon, 18 Mar 2024 09:31:04 -0700 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; charset=utf-8 X-Pobox-Relay-ID: EB247B00-E544-11EE-8C97-A19503B9AAD1-77302942!pb-smtp21.pobox.com Content-Transfer-Encoding: quoted-printable "Philippe Blain via GitGitGadget" writes: > This series introduces a new config 'advice.mergeConflict' and uses it = to > allow disabling the advice shown when 'git rebase', 'git cherry-pick', = 'git > revert', 'git rebase --apply' and 'git am' stop because of conflicts. > > Thanks everyone for the reviews! > > Changes since v2: > > * expanded the commit messages to explain why the tests for 'git rebas= e' do > not need to be adjusted > * adjusted the wording of the new 'advice.mergeConflict' in the doc, a= s > suggested by Kristoffer for uniformity with his series which is alre= ady > merged to 'master' (b09a8839a4 (Merge branch > 'kh/branch-ref-syntax-advice', 2024-03-15)). > * checked all new output manually and consequently adjusted the code i= n 1/2 > to avoid a lonely 'hint: ' line. > * adjusted the addition in advice.h in 1/2 to put the new enum > alphabetically, as noticed by Rub=C3=A9n. > * added misssing newlines in 2/2 as noticed by Phillip and tweaked by > Junio. > * rebased on master (2953d95d40 (The eighth batch, 2024-03-15)), to av= oid > conflicts in 'Documentation/config/advice.txt' due to Kristoffer's m= erged > series Looking good; will queue. Thanks.