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.5 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED, 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 930A71F619 for ; Fri, 28 Feb 2020 21:23:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726816AbgB1VXJ (ORCPT ); Fri, 28 Feb 2020 16:23:09 -0500 Received: from mail-lj1-f172.google.com ([209.85.208.172]:42816 "EHLO mail-lj1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725805AbgB1VXJ (ORCPT ); Fri, 28 Feb 2020 16:23:09 -0500 Received: by mail-lj1-f172.google.com with SMTP id d10so4863298ljl.9 for ; Fri, 28 Feb 2020 13:23:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:sender:from:date:message-id :subject:to:cc; bh=/M5RjQPzp+mwl5AtYvNUPyxqYUGuTmswSH9ScOWmzO8=; b=qwuEBYGmxmfKWrMNqfZYdjX4j/UyOM4uyeSUryU8x2YpdQ53zpdz5t/H54KvKEEPWC H17MqQTdcPy3UB8vacerLUGxddNONPley+dp+jaD7MwOoeYC3+z5VfpAYmxdl30rB+fN GKVpp28W4YWVniafkG7PABRzEaxBG4wFoeuyFAfiHAIqt2UWMtnr+v6lR48zSPIuJou9 Kf8lAOhQO9mUpMPkINCaV01RE4amjlaUPRCauXs4XuiSiJyeFjaECdU3ykJfs/zc2Ju5 yTqFMG4kr/5ikYW/EDp98vTDP+otCSOdwabcSFZvAiid68+yaYsooyyoUn161DSerwmR PGTA== 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:sender:from :date:message-id:subject:to:cc; bh=/M5RjQPzp+mwl5AtYvNUPyxqYUGuTmswSH9ScOWmzO8=; b=LAaj6kMygooRIt7RFgNpKZDKJY4T8l8490ys6v60rgD+71Qi6NIgO6mYz29DzxlfIL YPyZIa145f01ZQFvH/Eb6XIlPqj9jaeQgSgLQvnfG0IXJQ/86g+kE7sQtxUEZqourUQ4 PrjH+hbNNBze90/Wi7xABy2pMGHOgbxWgyNhZx5JnmwsKaqrkAYX3R2lUjKlKL4BtYYW Gvx8317mVdANaqyexbydJ+DyBPH4TJZ8nfnkLYseMkofWww+trdTvnQ7SeBmJGD13oy9 yDN50RM3eTRey/yzEj43UyQ2Jje/27Heo8k8EPBn6eNC1eKadyYIS/vFQIHWcKlcFYq3 YXQg== X-Gm-Message-State: ANhLgQ1/Kd2oB6Uk0jaWlZXJ+zYgfdNwbC3LPGDFDT1bFpHGzACh+o9r w3XkjWC46KddcPENIjmwpIsNR8xWai7T6Wt2gNs= X-Google-Smtp-Source: ADFU+vsK7ktOfRDfIfpYU6VNd3XfPfE+kWXfyR/qxAKjS6AI2BIDOWTqzXoxtOUH91ol2VTCCV8v8tM1cDqhNRQo4+M= X-Received: by 2002:a2e:80d1:: with SMTP id r17mr4122053ljg.292.1582924985750; Fri, 28 Feb 2020 13:23:05 -0800 (PST) MIME-Version: 1.0 References: <1320071582924243@iva6-ab1cb434301d.qloud-c.yandex.net> In-Reply-To: <1320071582924243@iva6-ab1cb434301d.qloud-c.yandex.net> X-Google-Sender-Delegation: rcdailey@gmail.com From: Robert Dailey Date: Fri, 28 Feb 2020 15:22:54 -0600 X-Google-Sender-Auth: os0XfWMuUpothbnjHylmjj9-JN0 Message-ID: Subject: Re: Why does `pull.rebase` default to `false`? To: Konstantin Tokarev Cc: Junio C Hamano , Elijah Newren , Git Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Fri, Feb 28, 2020 at 3:10 PM Konstantin Tokarev wrote: > In reality, newbies often end up doing chaotic merges caused by pull > instead of learning about rebase and branches. IMO, it would be better > to have pull.ff=only as a default. You and Junio make a really good point. After reading the responses, I definitely could reword my problem statement. The problem is that, for newbie git users (the majority of people I work with), they just do `git pull` which always does a merge. Myself (and many others) in simple workflows don't like it when newbies do merges on a pull. So the problem statement is: Prevent newbies from doing a merge commit on pull. Whether its a rebase or not is beside the point. I think making it --ff-only would solve the issue nicely. It forces them to make their intention explicit: Ether do a merge pull, or a rebase pull. But you are forcing them to pick (and ultimately get educated).