undefined | Better HN

0 comments

6 comments · 2 top-level

pooper3y ago· 2 in thread

I don't know much about git but I just do

    git reset --soft HEAD~n

where n is the number of commits I want to undo.

Known issue: can't undo all the commits.

git reset --hard origin/master just deletes all your local work on the current branch.

pooper3y ago

I never want that though. If I wanted to do something like that, I'd do the git reset soft, followed by git stash, followed by git switch. I think this at least allows me to look back at it locally?

Git switch is also something I learned recently so sometimes I type checkout because of force of habit but I am trying to do better (even though I'm not sure what switch dies that checkout can't but don't want to get into arguments, just want to do things the prescribed way).

still_grokking3y ago· 2 in thread

What's wrong with just working on and when the changes finally look like they should just do a `git commit --amend`?

Or if the commit should for some strange reasons really never exist just move HEAD one commit back. You could even get the changes back by merging the "bad" commit back without committing the merge (using the `--no-commit` switch).

I think you're demonstrating the original point

still_grokking3y ago

And that would be?

That Git is able to handle even completely weird requirements, like making history disappear?

j / k navigate · click thread line to collapse