git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthias Baumgarten <matthias.baumgarten@aixigo.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
	Elijah Newren <newren@gmail.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: pull.rebase config vs. --ff-only on command line
Date: Fri, 23 Jul 2021 11:36:30 +0200	[thread overview]
Message-ID: <ed3f7289-0893-5199-a7ca-087604aee029@aixigo.com> (raw)
In-Reply-To: <xmqq7dhi9nxv.fsf@gitster.g>

On 7/22/21 8:57 PM, Junio C Hamano wrote:
>>   * git -c pull.ff=only pull, do a fast-forward (or merge)
> 
> This should fast-forward if it can or otherwise fail if it cannot,
> right?

Yes, I should not have written "... (or merge)".

>>   * git -c pull.ff=only pull --merge, force a merge commit
> 
> This would fast-forward if it can or otherwise create a merge.
> Unlike "pull --no-ff", this should not "force" a merge commit.

Ack. I.e. it should work like "git merge" would by default.

>>   * git -c pull.ff=only pull --rebase, force rebase
> 
> This would rebase (we may not have our own commits on top of theirs,
> in which case it would end up fast-forwarding plus rebasing 0
> commits).

Yes. Again, this should and would behave like e.g. "git rebase" would if 
I were to rebase a branch which is a few commits _behind_ the branch I 
rebase on top of.

> I do not think the phrase "force rebase" makes much sense, though.
Agree.


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

  parent reply	other threads:[~2021-07-23  9:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-16 14:43 pull.rebase config vs. --ff-only on command line Matthias Baumgarten
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 [this message]
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=ed3f7289-0893-5199-a7ca-087604aee029@aixigo.com \
    --to=matthias.baumgarten@aixigo.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).