3 ms·

Yeah, rebasing in master is a huge no-no. LWN has a great article: https://lwn.net/Articles/328436/ https://lwn.net/Articles/328436/ Linus Torvalds explained

• OJFord 4y ago
  If you have local, un-pushed commits 'on' master, and there are upstream changes to master that you lack locally, there is absolutely nothing wrong with pull.rebase, i.e. rebasing your local changes on the upstream ones before you push. Beats the hell out of: * deadbeef (master) Merge branch 'master' of upstream |\ | * feedbeef A proper commit message from upstream * | deafbeef A proper commit message of the actual change |/ which not only hides the real commit message in CI, but also flips around the history so master's snaking around between upstream's path and the person not pull.rebase-ing's path.