From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Matthias Baumgarten <matthias.baumgarten@aixigo.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: Thu, 22 Jul 2021 17:09:39 -0500 [thread overview]
Message-ID: <60f9eca348290_678a208fb@natae.notmuch> (raw)
In-Reply-To: <xmqq7dhi9nxv.fsf@gitster.g>
Junio C Hamano wrote:
> Matthias Baumgarten <matthias.baumgarten@aixigo.com> writes:
> > * 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.
Today people rely on this doing a fast-forward-only merge (with
--no-rebase).
Changing this would break existing behavior they rely on.
It's not hypothetical [1].
[1] https://www.reddit.com/r/git/comments/omcngl/do_you_use_both_pullff_and_pullrebase/
--
Felipe Contreras
next prev parent reply other threads:[~2021-07-22 22:09 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 [this message]
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=60f9eca348290_678a208fb@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=matthias.baumgarten@aixigo.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.