Git: avoid reset --hard, use reset --keep instead - eviltoast
Git: avoid reset --hard, use reset --keep instead - Adam Johnson
adamj.eu
When I started learning Git, I found many references covering two ways to undo commits with git reset:
  • Ethan@programming.devEnglish
    251·
    2 months ago

    If you’re using reset with uncommitted changes and you’re not intentionally throwing them away, you’re doing something wrong. git reset —hard means “fuck everything, set the state to X”. I only ever use it when I want to throw away the current state.

      • Ethan@programming.devEnglish
        71·
        2 months ago

        Using git reset --keep would just make more work since I’ll have to throw away uncommitted changes anyways. Removing uncommitted changes is kind of the whole point, it is called ‘reset’ after all. If I want to preserve uncommitted changes, I’ll either stash them or commit them to a temporary branch. That has the added benefit of adding those changes to the reflog so if I screw up later I’ll be able to recover them.

  • Amicitas@lemmy.world
    7·
    2 months ago

    This is great advice. I did not know that ‘–keep’ was an option, and have offen done rather lengthy work arounds to achieve this.

  • thesmokingman@programming.dev
    4·
    2 months ago

    I do not actually understand the use case of —keep over the default —mixed, which I use regularly to restage patches or fuckups. I very frequently use —hard to test something out and blow it away without worrying about any changes. This whole conversation is fascinating because it highlights just how different everyone uses git and equally how bad sweeping generalizations like “—hard is something to avoid” are (without incredibly specific caveats).

    It seems like —keep makes sense if you’re not using stash before trying to change history when you have local, uncommitted changes? That might be why it’s not clicking with me; any time I fuck with history I stash anything local I might want to keep.