From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Sun, 08 Sep 2013 23:11:24 GMT
Subject: Re: [PATCH 0/3] Reject non-ff pulls by default
Message-ID: <CALkWK0m3ZQLkHU4sJntkeJ1Lrogjd_-Z8Q2KzpAPP28Ghf6SMQ@mail.gmail.com>
In-Reply-To: <CAMP44s01wK3Cf1ChOx=J7YKv0VgjYQB+NvyTt4-Mahsu4qG4iw@mail.gmail.com>

Felipe Contreras wrote:
> On Sun, Sep 8, 2013 at 1:10 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
>>     pull.<someoption> = rebase | merge [| always-fail]
>>
>> makes that choice in a clear way, I think.

The core issue is that users rarely want to merge locally: that's the
maintainer's job. Users simply want to rebase, and develop on
different branches that they will rebase onto origin. I like Felipe's
idea for using a pull.mode.