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, 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 E32F51F463 for ; Sat, 23 Nov 2019 20:50:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726842AbfKWUux (ORCPT ); Sat, 23 Nov 2019 15:50:53 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35429 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726820AbfKWUuv (ORCPT ); Sat, 23 Nov 2019 15:50:51 -0500 Received: by mail-wr1-f66.google.com with SMTP id s5so12773714wrw.2 for ; Sat, 23 Nov 2019 12:50:50 -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=f2VupkxvIeAw0pkgCZqcjjIlCsI+jfGBwxonk07gmw0=; b=ZpHIUROkJ7MIN4vLczVQFzzIKJIB6WdBRIbJfLAvkDcGchhaxggHqnq6xScuB3oci3 Rq2QJmDVuJng7OM6acdTjG8VEw7tON4ZoktC8MO3ce9H2+ZoIbexC8ojTmj29oTcuDUY CoiM9KK/RJBoe4fa8xAFIiYM+hbM9cJez0uVXJmgxgQby492U/LzlHr7diRK14iAFsMZ erah6xpL7IwPbe91INXeD9G0NyeodBo4B2F0TEXPzoIM5Bk/OEyVgg/dNxgYUUqRy+OV fNgOCHMMOoWpSh/bjji0z3GuUxh32oekDGflFli/ahq+zNiNGhHKGWGMXGeH9iEFUw4L isEQ== 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=f2VupkxvIeAw0pkgCZqcjjIlCsI+jfGBwxonk07gmw0=; b=ABYBiRh4PLy46VtpxmLjaR2unLCk4tSwMO2pqeM38fQxJe8I3WGsV0P0QltGk6FLRM 8j3Jxo24y4GXHz2+D8/UjyI5FPqS8Mqi1aot7t45deLpj2ZHvjIK+1vVwog5txC/mgYk c2NgtOx+8G00vrRwd5IdKXW6mzPH6DBn521gS7n3npfIEcFe6fxdrvV+H9Wq1rKS94km 19pOMu+1zVGPOOs1aS/IXJ9n0Cv9/Toe4MPIjpETQRWL/fg5rcB3A7BYPQr6HcDXTZUm 9fwvTHAteIgIuxEI9a178KDEK1ciY8rwBSa7kIFrapjvZ48sjFySsrjNO46rB9hK3I/9 4EqA== X-Gm-Message-State: APjAAAXItP73BUyTVLsBhExD1Xaccl/ZblHaC4CbQeXaNuIVSxGvD/f+ eIwxXuxOsDmc+q0ndoVkqakzbSEW X-Google-Smtp-Source: APXvYqwIvQqyqzqk5YkFtKClttt3AjF7o0krEgJ9e0mEtDworakxn4V7FcYyy103wJwcgnUZijl4WQ== X-Received: by 2002:adf:df8e:: with SMTP id z14mr23116931wrl.190.1574542249982; Sat, 23 Nov 2019 12:50:49 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d16sm3822295wrg.27.2019.11.23.12.50.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Nov 2019 12:50:49 -0800 (PST) Message-Id: <45fee72059d04d7770deb22ef605d6e26bbe762d.1574542243.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Sat, 23 Nov 2019 20:50:42 +0000 Subject: [PATCH 8/8] remote: no longer claim that branch.*.rebase=preserve is a thing 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 , Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- builtin/remote.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 3410ea19c7..afe9af09e9 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -309,8 +309,6 @@ static int config_read_branches(const char *key, const char *value, void *cb) int v = git_parse_maybe_bool(value); if (v >= 0) info->rebase = v; - else if (!strcmp(value, "preserve")) - info->rebase = NORMAL_REBASE; else if (!strcmp(value, "merges")) info->rebase = REBASE_MERGES; else if (!strcmp(value, "interactive")) -- gitgitgadget