Re: pull.rebase config vs. --ff-only on command line

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jul 16, 2021, 16:44 UTC
Message-ID: <60f1b7853b8a2_ade9208c1@natae.notmuch>
In-Reply-To: <CABPp-BEHZcfZNL+PG1vmqXGf4Qs3eoULb4NDDgbmOB30HzJu_Q@mail.gmail.com>

Elijah Newren wrote:

Show 15 quoted lines

> On Fri, Jul 16, 2021 at 7:52 AM Matthias Baumgarten
> <matthias.baumgarten@aixigo.com> 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