Undo git commit with TortoiseGit

Question

I'm using TortoiseGit in Windows for my git projects.

I made a local commit on my project. And I want to undo it.

How to undo git commit with TortoiseGit? without discarding my changes

Answer 1

Undo last commit: Reset

and

[NOTE] if you want to keep working tree changes, use Mixed instead.

the result:

---

Undo/Remove the commit which is not the last one: Rebase with Force

and

(You may hit the conflicts, but how to resolve the conflicts is another story. :P )

and

the result:

Answer 2

TortoiseGit -> Show Log -> Revert change by this commit

这将生成一个恢复提交的提交，因此您不会“丢失”您的更改。