Re: pull.rebase config vs. --ff-only on command line
- From
- Matthias Baumgarten <matthias.baumgarten@aixigo.com>
- Date
- Jul 16, 2021, 16:54 UTC
- Message-ID
- <00b50aa6-9b61-9f80-1d8d-2db3ed5e7638@aixigo.com>
- In-Reply-To
- <60f1b7853b8a2_ade9208c1@natae.notmuch>
On 7/16/21 6:44 PM, Felipe Contreras wrote:
Show 26 quoted lines
> Elijah Newren wrote: >> 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. >
Shouldn't every explicitly given merge option (like --ff-only) overwrite any configured option that would not even result in a merge, i.e. forcing a merge and thus forcing ff-only?
-- aixigo AG Karl-Friedrich-Str. 68, 52072 Aachen, Germany phone: +49 (0)241 559709-390, fax: +49 (0)241 559709-99 email: matthias.baumgarten@aixigo.com web: https://www.aixigo.com District Court Aachen – HRB 8057 Board: Christian Friedrich, Tobias Haustein Chairman of the Supervisory Board: Dr. Roland Schlager