git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthias Baumgarten <matthias.baumgarten@aixigo.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: pull.rebase config vs. --ff-only on command line
Date: Fri, 16 Jul 2021 16:43:10 +0200	[thread overview]
Message-ID: <c62933fb-96b2-99f5-7169-372f486f6e39@aixigo.com> (raw)

Hi,

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?

Best regards,
Matthias

-- 
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

             reply	other threads:[~2021-07-16 14:50 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-16 14:43 Matthias Baumgarten [this message]
2021-07-16 15:03 ` Elijah Newren
2021-07-16 16:44   ` Felipe Contreras
2021-07-16 16:54     ` Matthias Baumgarten
2021-07-16 18:00       ` Felipe Contreras
2021-07-19 14:26         ` Matthias Baumgarten
2021-07-19 17:43           ` Felipe Contreras
2021-07-22 18:57           ` Junio C Hamano
2021-07-22 22:09             ` Felipe Contreras
2021-07-23  9:36             ` Matthias Baumgarten
2021-07-16 16:39 ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c62933fb-96b2-99f5-7169-372f486f6e39@aixigo.com \
    --to=matthias.baumgarten@aixigo.com \
    --cc=git@vger.kernel.org \
    --subject='Re: pull.rebase config vs. --ff-only on command line' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox