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: X-Spam-Status: No, score=-10.5 required=3.0 tests=AWL,BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 1F7601F47D for ; Wed, 8 Mar 2023 00:14:04 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20210112 header.b=rWuuEv3B; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229812AbjCHAOA (ORCPT ); Tue, 7 Mar 2023 19:14:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229951AbjCHANs (ORCPT ); Tue, 7 Mar 2023 19:13:48 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A146C58B64 for ; Tue, 7 Mar 2023 16:13:43 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id v15-20020a17090a458f00b0023816b2f381so5770678pjg.2 for ; Tue, 07 Mar 2023 16:13:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678234423; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=KdGpg+VHfblZTyhARJ7GTgI2+UwswrpREOPBsI218zk=; b=rWuuEv3BDH0viww3KAhVHxFWOWdEcKUlhxehQEDBAJ01hg/ykoYkk1ODwxwDqpVkS6 mqh+zfKSxrC5R7V6trYM623KufJh+2Liz+BNAPD+vW3P25XlbhRKnL505SqQtRoW2+T8 P7OfDeSmulobT8XTLSpp4aOLImIR2KSMeJOJO479wYR7p1OtZ9Zo9HZUFYPVrYNIE+i2 7MHRpZiBMSJ7slJ+Rbduzgn2sOJ5MpfiYk5zQzOFVw2vODCywkMNo/ggfwTjGVCuMQur TFFst8WuYddso9oWYfyU0zf1YtDBKOwuDvVH0Hgbd+csFxdEeHjx2YAflQw/7BRJYcA8 CecQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678234423; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KdGpg+VHfblZTyhARJ7GTgI2+UwswrpREOPBsI218zk=; b=Q0wWPsjax9FwrJ3Siut6DRw3k/muRViu9K15KRH1g3OGW/1sdk7mOCMhsM3Ce5I3bq ELfph2MdH+b5KKlPRP1HC9kNaTr0Jt387enwfsgIrCxtuTfBkyQ8qODzULXwQneg4nLA WXukF3VV8cgdKuWHDE6siNVqPWLCRF8FVIospY5tc0Y77KbW9Xw77s6ma2ELA+olS6fa H6BySs5STemtI6cgjmsYGuzrwsayMeqkrqyOXc3abFTuOHZIfgev/Y2LOBOvEp7Zg9Ei drbrkEKGOrONPDSbzMiZDrNVDzEWMQN5H4TsqrcYApyiGYVlnGBFfgynD6iwtX7E3G9U jO8w== X-Gm-Message-State: AO0yUKWAN0+ZPUwFxi7/wL98n228vQ3SaMhuSvFk6wmORdrUzBXpFSKd RD1UtrmGfi23gYBYqj5b9CriCEK8LOYdLA== X-Google-Smtp-Source: AK7set9z9SRwceOnB1P65RjunIKg8T0/ZjbLFfcaRPh5jjmCzDnYWESn6aK1gYTFFkHtWQz6kP5/T+M6vD44mA== X-Received: from chooglen.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:3a07]) (user=chooglen job=sendgmr) by 2002:a62:ce43:0:b0:593:dc61:2161 with SMTP id y64-20020a62ce43000000b00593dc612161mr6798609pfg.2.1678234423118; Tue, 07 Mar 2023 16:13:43 -0800 (PST) Date: Tue, 07 Mar 2023 16:13:41 -0800 In-Reply-To: <20230305050709.68736-1-alexhenrie24@gmail.com> Mime-Version: 1.0 References: <20230225180325.796624-1-alexhenrie24@gmail.com> <20230305050709.68736-1-alexhenrie24@gmail.com> Message-ID: Subject: Re: [PATCH v6 0/3] rebase: document, clean up, and introduce a config option for --rebase-merges From: Glen Choo To: Alex Henrie , git@vger.kernel.org, tao@klerks.biz, gitster@pobox.com, newren@gmail.com, phillip.wood123@gmail.com, Johannes.Schindelin@gmx.de, sorganov@gmail.com, calvinwan@google.com, jonathantanmy@google.com Cc: Alex Henrie Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Alex Henrie writes: > Changes from v5: > - Add commit message note about --no-rebase-merges having always worked > - Add commit message note about the test for --no-rebase-merges being > somewhat contrived > - Rephrase the documentation to avoid using the phrase "By default" with > two different meanings, and in so doing clarify that --rebase-merges > without an argument is not the same as --no-rebase-merges and not > passing --rebase-merges is not the same as passing > --rebase-merges=no-rebase-cousins > - Add commit message note about keeping --rebase-merges="" for now out > of an abundance of caution > - Rephrase the warning about --rebase-merges="" to recommend > --rebase-merges without an argument instead, and clarify that that > will do the same thing > - Remove the test for --rebase-merges="" > - Rename the config option from rebase.merges to rebase.rebaseMerges and > explain why in the commit message > - Add commit message note about why "true" is a valid option for > rebase.rebaseMerges and why --rebase-merges without an argument does > not clobber the mode specified in rebase.rebaseMerges > - Rephrase the documentation to clarify that --rebase-merges without an > argument does not clobber the mode specified in rebase.rebaseMerges > - Add another test for incompatible options This version addresses all of the concerns I had with the previous version. Thanks! Besides the concerns that other reviewers raised and a possible mechanical error, I don't have any outstanding concerns. I'd be happy to see this merged when those are resolved :)