4 ms·
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 howev
by michaelmior 4y ago
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.
- galaxyLogic 4y agoRight and it is not obvious: git reset HEAD@{1} .
- acchow 4y agoRight, 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.