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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.7 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_NONE, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 1DBE71F8C6 for ; Fri, 16 Jul 2021 16:45:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229574AbhGPQrv (ORCPT ); Fri, 16 Jul 2021 12:47:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbhGPQru (ORCPT ); Fri, 16 Jul 2021 12:47:50 -0400 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68DE7C06175F for ; Fri, 16 Jul 2021 09:44:55 -0700 (PDT) Received: by mail-ot1-x329.google.com with SMTP id f12-20020a056830204cb029048bcf4c6bd9so10455316otp.8 for ; Fri, 16 Jul 2021 09:44:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:message-id:in-reply-to:references:subject :mime-version:content-transfer-encoding; bh=RN5+Pe56KQvdrpTssQ0ziVUGa1hIzfBja9WYdXva7+c=; b=fzMggxpEs4+zqTZVQ82RclNAE7dZ8RrxSpPbPrxmTcrnFu8uUqWBnAH2czFSX0Eqv1 0T4Rxg6kj81tifHnSUg/KhEZEflAcV/uYidX4uw10COiLfsEKLjeu12i9niIYjAdbq0z M7CWxOl6bgj+6Qz+UFnOq4WL/SHIu0z4b+yPxulQGh0rxeqTdzCpvMMG2WiAENZkZv/c vXnNSHwE6QTg1zS1ix+woef+XvLXu6UW3E28cNpOrqkNJ8mDiONnrUYmbf4mgBtyuShi CcmB8Qi+3WbWyEW/Gv5Nu+kwqOQWx4rqKbandvlQQ0+kAWuKTEy//praRnX7wIcmb8XI /Ufw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version:content-transfer-encoding; bh=RN5+Pe56KQvdrpTssQ0ziVUGa1hIzfBja9WYdXva7+c=; b=JdwdXhVGHCxoDKIj4pvDGeQjvycf6RRs1f3rumjzFNTaG/4W2YBWIvRPTyYopButTl 5G0Vr3LoprZvFDBjI7KCFLleDA1Vi3ydfR/dAeM01VRYG0QL2SPyDm+cINb+POOMYMb4 P1lzliSWp26zYKgPZ2AFPUPlqw7TsYGvV1MFia3sN+A/QjiBv1y11xzTiT6HnOkTGrYu yELY25BCTQCFjYSv5vZGwtbz8bXDo18ygG0Fta04rQYCtneoU2VE/hoZFnWh7J52gOTL d2wu0O2gvJZrxZzqqIHlq/yJBa0pQAx7WKpipgW9vWqyCsQG5+G+B9oNWkohr30FjSX2 8hKw== X-Gm-Message-State: AOAM533om33eQOxQq61RKkMxnlKEzgcgabgd19siWCtif8QF6mEbC/2O ijMVBOGKxzA+Qz0wQERhg4c= X-Google-Smtp-Source: ABdhPJw6mj7boI5aH6yukMjn5kIJ1V0Iu0cvmU7AMHa4HjJykCgjzlZoC1e1Z88gW1L0sTPc7nRhOg== X-Received: by 2002:a05:6830:10e:: with SMTP id i14mr960167otp.242.1626453894829; Fri, 16 Jul 2021 09:44:54 -0700 (PDT) Received: from localhost (fixed-187-189-167-231.totalplay.net. [187.189.167.231]) by smtp.gmail.com with ESMTPSA id p9sm1948488otl.64.2021.07.16.09.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jul 2021 09:44:54 -0700 (PDT) Date: Fri, 16 Jul 2021 11:44:53 -0500 From: Felipe Contreras To: Elijah Newren , Matthias Baumgarten Cc: "git@vger.kernel.org" Message-ID: <60f1b7853b8a2_ade9208c1@natae.notmuch> In-Reply-To: References: Subject: Re: pull.rebase config vs. --ff-only on command line Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Elijah Newren wrote: > On Fri, Jul 16, 2021 at 7:52 AM Matthias Baumgarten > wrote: > > this is my first time contacting you guys and girls so I hope this mail > > achieves the expected standard. I've discovered the following behaviour > > of git: > > > > If pull.rebase is configured to true and git pull --ff-only is executed > > it seems like the config wins, i.e. issuing "Successfully rebased and > > updated refs/heads/...", which is not what I would expect. I always > > believed that command line options would overwrite configured options. > > > > Is my assumption that command line options always win wrong or is this a > > bug? > > It's a bug. No it isn't. Elijah is elevating to fact his opinion of what --ff-only should be changed to. But it has not been changed. Today --ff-only is meant only for the merge mode of `git pull`, and like other merge-only options (e.g. --ff, --no-ff, and --squash) it's ignored in the rebase mode. -- Felipe Contreras