Based on a simple story about Mark, a software developer, I'm guiding you how to undo changes in git. How to undo commited changes, how to revert changes that were pushed into the master branch, and how to reject local changes. The presentation does not cover other solutions to undo changes. The idea is to encourage developers to use console git over plugins for editors like RubyMine or Atom. Console git works everywhere the same way. When you pair-program with a remote team member, console git gives you more flexibility and reliability.

1. StatisticsUndoing changes in git

2. I. Undoing committed changes
II. Reverting pushed changes
III. Discarding local changes

3. How can I undo committed changes?

4. Mark
I don’t need this
change!

5. git reset --hard to_commit
Link to git help

6. Commit is no
longer here!

7. To undo commited changes I will use
`git reset --hard to_commit`

8. How can I revert pushed changes?

9. Mark, remove
that feature
users don’t use the feature

10. git revert commit
Link to git help

11. Without the
feature, users are
happy!
it was
reverted

12. To revert public changes I will use
`git revert commit`

13. How can I discard local changes?

14. Mark

15. git checkout -- todo.txt
Link to git help

16. Local changes have
been discarded!

17. To discard local changes I will use`git
checkout -- todo.txt`

18. I. Undoing committed changes
II. Reverting pushed changes
III. Discarding local changes

19. Use git

20. Thanks!