Undo last commit

[lukepighetti]

Hey all, I use VSCodes "undo last commit" command often. Trying to figure out which option here does the same. Any insights?

[mark2185]

If you scroll a bit down, you'll see the undo option (z) which will probably soft reset to HEAD^, does that help?

In any case, it will show a popup which you can confirm or cancel.

[stefanhaller]

This was recently changed on master to do a soft reset. Careful, in the last release it still does a hard reset, which is likely not what you want.

Alternatively, you can select the commit before the last one and hit g enter to do a mixed reset manually (or g s for a soft reset). That's similar to what you would do on the command line.

[lukepighetti]

If you scroll a bit down, you'll see the undo option (z) which will probably soft reset to HEAD^, does that help?

In any case, it will show a popup which you can confirm or cancel.

isn't undo context sensitive based on what your last action was? looking for a command that always "undos" the last commit

[stefanhaller]

Lazygit doesn't have that. In that case, selecting the last-but-one commit and pressing g for resetting to it the closest you will get.

[stefanhaller]

Oh, and I'm also curious why you are doing that often. Are you aware that you can amend commits, and reword their commit messages? I find those much easier in cases where I found something wrong or missing with the commit, rather than undoing it and creating a new one from scratch. Curious what other reasons you have to undo commits.

[lukepighetti]

just a workflow preference that is commonly available in my standard toolset

[jesseduffield]

I'll regularly store WIP commits on a branch before checking out another branch, and then when I come back I'll pop the WIP commit off again (I find this much nicer than using the stash which is not correlated to branches). But I find it fine to just navigate to the parent commit of the WIP commit and do a soft reset with 'g'.

Perhaps my workflow would be better if I had a global keybinding to perform the pop. I might test that out locally to see how it feels.

[stefanhaller]

I work the same way (I also prefer WIP commits over stashes), and I also don't mind resetting manually, especially because in some cases I might have made several WIP commits and I want to pop them all at once.