Zbigniew Jędrzejewski-Szmek wrote: > On Thu, Feb 09, 2023 at 06:44:03PM +0100, Tomas Hrcka wrote: >> Hi All, >> >> Fedora Linux 38 has now been branched, please be sure to do a git pull >> --rebase to pick up the new branch > > I know this has been discussed seemingly on every branching since the > switch to git, but anyway... > > '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. Because: 1. it avoids those pesky merge commits, producing a nice linear history, and 2. (not relevant for Fedora dist-git, but for repositories that allow force pushes) it also works if the repository has been force-pushed to. See also (not by me): https://coderwall.com/p/7aymfa/please-oh-please-use-git-pull-rebase Kevin Kofler _______________________________________________ devel mailing list -- devel@lists.fedoraproject.org To unsubscribe send an email to devel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
