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=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 A37121F45E for ; Sat, 15 Feb 2020 21:37:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727928AbgBOVhL (ORCPT ); Sat, 15 Feb 2020 16:37:11 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:37891 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727795AbgBOVgz (ORCPT ); Sat, 15 Feb 2020 16:36:55 -0500 Received: by mail-wr1-f65.google.com with SMTP id y17so15115009wrh.5 for ; Sat, 15 Feb 2020 13:36:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=hbUII9xEJWLRTvnSRMlVPOQoTvuwP3CVkCP0W1Vl2Ps=; b=pLEx9wQ9Z2Y8wlaCj+qaj8N1/6n6hDMrAd9WWPhJaUYLtSEOXwgQgwjwm5SOEZ6f50 W8St5ZlRdVyPx6K4HHPhI1rQe8quIH4ATRgMuoh/MZAJnNcKdj89SxHjbPgzGs+DIs/b f/FaDJBYJ9MEV1RXvjFTgJpv4W/YMdja6l3l8lDK6JzREFEE+W5iVOw6OSIU7WBeSNmg 6n8aU73Zw6RXQgOzX5FytI6FCmqpW1m58f+9Jy6P5KRAagY2azcTV9mh9Bw+GnHpLZUY YqdpoegYbgt8aYvj7yHc23eWvvAYZeOeV45zXlK/TdlD8WmZfyJKz0Pdno7G1oT0iL/g wW+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=hbUII9xEJWLRTvnSRMlVPOQoTvuwP3CVkCP0W1Vl2Ps=; b=uS7Ly7pJtlgCeT9iVagZj+vVvquu7Oe5f4DMvh+QVmPz6B4k9vkfm+8RHVJapOBEAz hnkF65SWS5L6aDYuBsLiI1oHmmdB19xsJIvHVlQopu89cajFVLoQ4pnMonsZ4vnVKDtx wmt5BD3e3q7KA5OTUeGieEQvettyFe2TAbsqEWdkJQu0wPg9+SN6+CynI0Qnwt6qPBfl yPhvekV/CB13acLSyTmKaWrVBEr9gFtQyz9aDXbTzakw/IO9BEzR482JYcj1gCUYbpMX 3OURAqqmcyqOPVRiiu29Ih3zC8i4OOfoxytk0/iIeXwzClrlGnUHfRHnXebChJ+FgWLd uRuA== X-Gm-Message-State: APjAAAWXOC5oIrn7GwAWqtsDR6wzflZfD7q58H4LMX8Wuphd8oz23Zcw otSap7V7U5v55hCi1YKw+3CF2bZr X-Google-Smtp-Source: APXvYqxbn1ic3QPCBGnluQoXg0yF3zspWST+6qfHWfgIMGe9hcxl7L8ZQ9ZFFm4asXTJQhbFmw3zag== X-Received: by 2002:adf:8442:: with SMTP id 60mr11836997wrf.416.1581802613016; Sat, 15 Feb 2020 13:36:53 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u4sm12775197wrt.37.2020.02.15.13.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 13:36:52 -0800 (PST) Message-Id: In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Sat, 15 Feb 2020 21:36:34 +0000 Subject: [PATCH v5 13/20] rebase: add an --am option Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes.Schindelin@gmx.de, phillip.wood@dunelm.org.uk, liu.denton@gmail.com, gitster@pobox.com, plroskin@gmail.com, alban.gruin@gmail.com, szeder.dev@gmail.com, jrnieder@gmail.com, emilyshaffer@google.com, Elijah Newren , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Currently, this option doesn't do anything except error out if any options requiring the interactive-backend are also passed. However, when we make the default backend configurable later in this series, this flag will provide a way to override the config setting. Signed-off-by: Elijah Newren --- Documentation/git-rebase.txt | 11 ++++++++++- builtin/rebase.c | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 6e2569cd8a7..93092da3bf6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -258,6 +258,13 @@ See also INCOMPATIBLE OPTIONS below. original branch. The index and working tree are also left unchanged as a result. +--am: + Use git-am internally to rebase. This option may become a + no-op in the future once the interactive backend handles + everything the am one does. ++ +See also INCOMPATIBLE OPTIONS below. + --empty={drop,keep,ask}:: How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become @@ -378,7 +385,7 @@ See also INCOMPATIBLE OPTIONS below. Ensure at least lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is - ever ignored. + ever ignored. Implies --am. + See also INCOMPATIBLE OPTIONS below. @@ -418,6 +425,7 @@ with `--keep-base` in order to drop those commits from your branch. --whitespace=