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-Status: No, score=-3.5 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,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 B17841F86C for ; Wed, 25 Nov 2020 03:50:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727002AbgKYDsH (ORCPT ); Tue, 24 Nov 2020 22:48:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726591AbgKYDsH (ORCPT ); Tue, 24 Nov 2020 22:48:07 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30868C0613D4 for ; Tue, 24 Nov 2020 19:48:07 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id x22so765375wmc.5 for ; Tue, 24 Nov 2020 19:48:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=leodxb0vi4LG+4AXPsKyLh7PXhg4sfs3P2rCSwmm2nk=; b=TYokjQVMHy1istbL7iefNs8C83yRf2txAmPP078abvc4Tix50XNOdgEVS5/iiYJYYT e4QJNAAzVK10Mi5u5cTX7JIHS9m+17E2aeVJA/myOWz+rIk1RvlKhTR53OKLJThcPR+r ASk5zYsAhxr7hiN1++cstjlSvwzWpQHj2vqwFWnGzlL29yPmVlXC+SrVb7CYPMi06EqP ox9aXRQXnI7puj9r1dYTaqRl/JXDXyOsbqPsgl7YF+kZ9t+MF3nkgR3+6vrf8+EV1LDX gUE1mpJNRfaZ51tVdZlf4Pn45RSfYKgENvsVl+8b0pxknKKKWBWZUa+CKoxiL5099Oaj FOQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=leodxb0vi4LG+4AXPsKyLh7PXhg4sfs3P2rCSwmm2nk=; b=o1UfAXrXw4zfFMxltaWmFMSnyVk9dTG0JUHvic5eK4QoQeL+IBqhO+cy+6hF4SgW5/ DWknwQFMr9T/GJIrJJdWYmpmjEPtDf3ZVlTIgej5Ys1Y5DnVaU6AiXKpgW/f2EETvP1r Q0nb7wsSmKrrcywez/e7FZ2i56wEFy8DulEL/HpcaR93vHqQBd0vTi5wzKQ+7QH2hDze xPe4sNChlkrUTuSCzuy7qdMj945OYIT1LG2PfUsfJnnksvADFsXxeXBKjH3UHPSd5H8t bh1lO6Z4xapLeR4tV83RDFCctoxI/rq+YSvo9fWoRELEwy2ZEJIVuwkMbeHOQHPTtRHR AHTQ== X-Gm-Message-State: AOAM532pJ6rCU3BzVPvJlUrDBeZHqGRZAiNDpKwe6RY2ZyQNx5QdtvQ4 YVHjhzN8kh0EEhcq4tvUwXgu/Pn7pciW6DAfap0= X-Google-Smtp-Source: ABdhPJzFL4gjgIDRdS+YDFY/2PM3juaNrG6JMPpOj0RcQzo6NZn1lLLxse6RFPhaKWnbwtEye5JZTbPE30Twe3mLyUw= X-Received: by 2002:a7b:c3d5:: with SMTP id t21mr1483814wmj.37.1606276086005; Tue, 24 Nov 2020 19:48:06 -0800 (PST) MIME-Version: 1.0 References: <20201125020931.248427-1-alexhenrie24@gmail.com> <20201125020931.248427-2-alexhenrie24@gmail.com> In-Reply-To: From: Felipe Contreras Date: Tue, 24 Nov 2020 21:47:55 -0600 Message-ID: Subject: Re: [RFC 2/2] pull: default pull.ff to "only" when pull.rebase is not set either To: Alex Henrie Cc: Git , Junio C Hamano , "Raymond E. Pasco" , Jeff King , =?UTF-8?B?VsOtdCBPbmRydWNo?= , Theodore Tso Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Nov 24, 2020 at 9:45 PM Felipe Contreras wrote: > On Tue, Nov 24, 2020 at 8:14 PM Alex Henrie wrote: > > Before making this the default we need a solution *right now* that is > a sane default. This mail was sent by mistake. I was going to say: We need a warning like: The pull was not fast-forward, please either merge or rebase. When the default (pull.ff=only) is set. It is the current status that is more urgent to fix. -- Felipe Contreras