News for hackers. Stuff that matters.

A comment on /story/33612410. Parent comment

Re: by michaelmior on Tuesday November 15, 2022 @09:15PM (#33617991)
git reset HEAD@{1} should do the trick to "uncommit" and keep uncommitted changes in the absence of conflicts. (I may be missing some edge cases.) It does however unstage changes.
[ Parent | on HN ]
Re: by galaxyLogic on Tuesday November 15, 2022 @09:30PM (#33618101)
Right and it is not obvious: git reset HEAD@{1} .
[ Parent | on HN ]
Re: by acchow on Tuesday November 15, 2022 @11:52PM (#33619017)
Right, if you grok the git model then this makes sense. But if you just want to use a tool without learning how it manages state, git is a pain.
[ Parent | on HN ]