VeganPizza69 Ⓥ

No gods, no masters.

  • 9 Posts
  • 68 Comments
Joined 1 year ago
cake
Cake day: July 5th, 2023

help-circle
  • Squashing

    The s “squash” command is where we see the true utility of rebase. Squash allows you to specify which commits you want to merge into the previous commits. This is what enables a “clean history.” During rebase playback, Git will execute the specified rebase command for each commit. In the case of squash commits, Git will open your configured text editor and prompt to combine the specified commit messages. This entire process can be visualized as follows:

    Note that the commits modified with a rebase command have a different ID than either of the original commits. Commits marked with pick will have a new ID if the previous commits have been rewritten.

    https://www.atlassian.com/git/tutorials/rewriting-history

    You can also amend for a softer approach, which works better if you don’t push to remote after every commit.

    The git commit --amend command is a convenient way to modify the most recent commit. It lets you combine staged changes with the previous commit instead of creating an entirely new commit. It can also be used to simply edit the previous commit message without changing its snapshot. But, amending does not just alter the most recent commit, it replaces it entirely, meaning the amended commit will be a new entity with its own ref. To Git, it will look like a brand new commit, which is visualized with an asterisk (*) in the diagram below.

    You can keep amending commits and creating more chunky and meaningful ones in an incremental way. Think of it as converting baby steps into an adult step.














  • Hey, I have re read your comment a few times. Important info, but unsure how it relates to my comment. Rich people don’t contribute that much to C02?

    There are 2 necessary changes as layers in this context:

    1. There are also studies that show the GHGs for “rich people’s investments”. This is important because they are in the way of necessary adaptation and mitigation. We can’t do anything meaningful about climate and biosphere because that would require ending profiteering from planetary destruction, it would require decommodification.

    2. Rich people’s consumption is excessive for anything. Not just their carbon footprint, but their ecological footprint. But they are a small minority, especially the richest. Being a small minority means that if they lose their… wealth and become wage workers, that’s going mean only a decrease of 15% GHGs. This 15% is not meaningful to avert ruining the planet’s surface. We need more than 100% (zero emissions and then removing carbon dioxide from the atmosphere). This means that EVERYONE has to participate, which also means that we need cooperation. And you don’t have cooperation in a capitalist class society with all this “rat race” going on, you can’t, we’re literally all enemies (competitors) in this game.

    So they can tell me how to live my life?

    That’s one side of it, yes. To have any meaningful action, all sides of economic activity have to change, we need decreases in production (supply), but also in demand (consumption). If only production decreases, the demand side goes nuts and there’s hyperinflation and other problems. If only demand decreases (unlikely), the production side, which is owned by rich people, may decide to force and coerce an increase in demand somehow, as has been happening at least since the end of WW2.

    Here, a game: https://play.half.earth/