Kevin Kofler via devel wrote:
> Zbigniew Jędrzejewski-Szmek wrote:
>> 'git pull --rebase' is a strange command to suggest. I does the job,
>> but almost by accident, and it's confusing things by mixing in rebasing.
>> Can we make this just say 'git fetch' or 'git fetch -v' ?
>
> The thing is, you should ALWAYS git pull --rebase to pull from git
> repositories, NEVER just git pull.
While that was generally good advice (for folks who aren't
maintainers of an upstream project, i.e. most people), it's
not as accurate a statement as it once was.
Since git-2.33.1 (2021-10-12), `git pull` should not create
a merge commit by default. The default is --ff-only, which
means:
Only update to the new history if there is no divergent local
history. This is the default when no method for reconciling
divergent histories is provided (via the --rebase=* flags).
Running `git pull` should do what most people want without
the risk of surprising newer users due to a rebase with
conflicts. It's better to have the pull simply stop rather
than creating a merge (as it used to do) or attempting to
rebase automatically -- as a default.
Regardless, `git fetch` is the better recommendation here.
It achieves the goal of getting the newly-branched release
into the local repository and has no other effects.
--
Todd
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
