this post was submitted on 04 Jun 2025
147 points (94.5% liked)

Linux

54842 readers
933 users here now

From Wikipedia, the free encyclopedia

Linux is a family of open source Unix-like operating systems based on the Linux kernel, an operating system kernel first released on September 17, 1991 by Linus Torvalds. Linux is typically packaged in a Linux distribution (or distro for short).

Distributions include the Linux kernel and supporting system software and libraries, many of which are provided by the GNU Project. Many Linux distributions use the word "Linux" in their name, but the Free Software Foundation uses the name GNU/Linux to emphasize the importance of GNU software, causing some controversy.

Rules

Related Communities

Community icon by Alpár-Etele Méder, licensed under CC BY 3.0

founded 6 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
[–] teawrecks@sopuli.xyz 2 points 2 days ago (1 children)

It is not standard workflow in git to change the commit history for a branch on the remote. You have to use --force, and the next time someone pulls they also have to --force their any local tracking branch to follow the remote. Every git guide on the internet warns against pushing a rebase for this reason.

Locally you can do whatever. I'm not familiar with Mercurial, but I assume it must work the same as git: I can do whatever I want locally, and only what I push matters. And when I'm doing stupid stuff locally as I organize my changes, rebase is handy.

[–] sxan@midwest.social -3 points 2 days ago (2 children)

Read the thread. The Kernel maintainers use b4, which rewrites history.

Mercurial does not work like git, and history is immutable: there are no commands for changing history.

[–] CommanderCloon@lemmy.ml 5 points 2 days ago

Yes, it rewrote history, and thanks to Git's robustness it was extremely easy to notice and identify. Forced rewrites are not an issue if you trust people on your repo, and if you don't (and honestly you shouldn't, everyone fucks up), you can disable force rewrites in the remote

[–] teawrecks@sopuli.xyz 1 points 2 days ago

I'm responding to the literal words you said that were inaccurate. Cheers.