this post was submitted on 02 Sep 2024
56 points (93.8% liked)

Git

2828 readers
1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 1 year ago
MODERATORS
Ategon@programming.dev
canpolat@programming.dev
jnovinger@programming.dev
56
Git: avoid reset --hard, use reset --keep instead (adamj.eu)
submitted 2 weeks ago by norambna@programming.dev to c/git@programming.dev
8 comments fedilink hide all child comments
 

via https://fosstodon.org/@adamchainz/113069875974994637

you are viewing a single comment's thread
view the rest of the comments
[–] firelizzard@programming.dev 24 points 2 weeks ago (1 children)

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.

[–] FizzyOrange@programming.dev 5 points 2 weeks ago (3 children)

Well yeah I think the point is you're human and you might make a mistake.

[–] firelizzard@programming.dev 6 points 2 weeks 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.

[–] Benaaasaaas@lemmy.world 5 points 2 weeks ago

Let me live with my mistakes

[–] MyNameIsRichard@lemmy.ml 0 points 2 weeks ago* (last edited 2 weeks ago) (1 children)

~~Waddyamean "that's what backups are for"~~ Sorry, wrong community

[–] FizzyOrange@programming.dev 3 points 2 weeks ago

Not many people back up continuously, so this is still useful.