Re: When are you going to stop ignoring pull.mode?

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 19, 2021, 16:54 UTC
Message-ID: <xmqq4kcqnt0i.fsf@gitster.g>
In-Reply-To: <948ef19f-5588-62e9-6fc7-aa6d82f21a1b@aixigo.com>

Matthias Baumgarten <matthias.baumgarten@aixigo.com> writes:

Show 8 quoted lines

> Initially I came from the situation where I (as maintainer of a
> repository) proposed to do a `git pull --ff-only <remote-git-url> 
> <branch-name>` for the others to integrate the newest changes safely
> (i.e. failing if they had errouneously worked on that branch, which it 
> is not intended for). I thought I could reach that safety with the
> `--ff-only` part, but it seems one of the devs had pull.rebase set for 
> him locally and thus managed to bypass my "safety". Mr. Elijah Newren
> called this a bug, see [1].

Yes, I saw it and I agree with Elijah.

Thanks.