From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id C0B641F463 for ; Tue, 7 Jan 2020 20:11:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728684AbgAGULL (ORCPT ); Tue, 7 Jan 2020 15:11:11 -0500 Received: from pb-smtp21.pobox.com ([173.228.157.53]:54312 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728358AbgAGULL (ORCPT ); Tue, 7 Jan 2020 15:11:11 -0500 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 3C41A98238; Tue, 7 Jan 2020 15:11:11 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=8+5coq1Rh9ze+tvhxzO9gRFbgt0=; b=gUkzWO GM/PYgO+AnMpnVC8iFXwjpnnk2zD/Nza1BbX6wFbka18titoFz45+BEso6MTce5q sLaWiYRL/mamjk3hhqKlHROB96z7bRObZvU6pQTJzhRqBB/ah6FUUI2RvlK+oKZI vU49FjxhZRtuMpWAfoK7G+dD8fZ3n/NGmOTHc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=Kmdjul6oNP1cTORkFUVgzJm/AQm47xRt tyhFpze6EtPajjASIyOA9PvTOcJ9yTVLHQsmq7086yThIAEGxUCRBOjHzC+930bT yjykZt6+WhtETGha4k2ItPNXtj0SFXPBN88FT1Mhohc3yUvUwvRSuhblCZT3Zzn4 z5KqSatgGjQ= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 326A898237; Tue, 7 Jan 2020 15:11:11 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.76.80.147]) (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 5FD1C98236; Tue, 7 Jan 2020 15:11:07 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: Elijah Newren Cc: Phillip Wood , Elijah Newren via GitGitGadget , Git Mailing List , Johannes Schindelin , Denton Liu , Pavel Roskin , Alban Gruin , SZEDER =?utf-8?Q?G=C3=A1bor?= Subject: Re: [PATCH v3 10/15] rebase: add an --am option References: <1df11f0b5105b1f602fdd723e0f74565e436faba.1577217299.git.gitgitgadget@gmail.com> <8f2fa083-114a-011f-1480-ae0ebd67d814@gmail.com> Date: Tue, 07 Jan 2020 12:11:05 -0800 In-Reply-To: (Elijah Newren's message of "Tue, 7 Jan 2020 11:26:58 -0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: D6E8D492-3189-11EA-94F1-8D86F504CC47-77302942!pb-smtp21.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Elijah Newren writes: > However, I thought of this option before Junio suggested a > rebase.backend config setting, so we could just rely on that instead. > Thus, getting rid of the "--am" flag in detail would mean: > * I need to redo the test changes in this series to use "-c > rebase.backend=am" instead of "--am" > * It will be slightly harder for users to use the escape hatch in > one-off cases during the transition > * We need to figure out the right way to reword the documentation > > The first two are pretty minor, so that probably means I just need to > come up with some good wording for the documentation (suggestions > welcome...) It probably is a good idea to keep --am (and possibly --[no-]am) as long as rebase.backend option exists. A configuration variable that changes behaviour without allowing it to be overridden from the command line is not a good idea.