Undo, Redo, Change History with Git

Undo, Redo and Change History with Git

Transcript

1. Undo, Redo Change History with Git
2. Joshua Wehner • @jaw6 • jaw6@github.com • Minneapolis, MN, USA • GitHub Training
3. Undo & Redo Scenarios
4. Undo "Public" Change • It's broken • But it's pushed • git revert <sha>
5. Tweak Last Commit • Oooops • Committed too fast • git commit --amend
6. Regrets, I've Had a Few • Ooooops • That's mostly rubbish • git reset <last good sha>
7. Throw It All Away • It's all rubbish • I regret everything • git reset --hard <last good sha>
8. Wait, On Second Thought • Throw It All Away • Could I maybe get that back? • git reflog git reset --hard <sha>
9. Well, That Wasn't So Bad • Most of that is trash • But that one? That one is good. • Gimme. • git cherry-pick <good one>
10. Put That Thing Over There • I should have made this branch earlier • Those commits should not be on master • git rebase master
13. Well, Then Again • Throw It All Some of It Away • I regret that one thing • Some of the rest of it was okay • git rebase -i <public sha>
14. I Was Wrong Before • I thought I was wrong • But I wasn't • git commit --fixup <sha> git rebase -i --autosquash
15. Forget I Said That • Stop tracking this file • I mean it • git rm --cached .gitignore git clean -f (also -x maybe?)
16. Thank you! Undo, Redo, Change History • @jaw6 • jaw6@github.com • http://training.github.com/
17. I'm Only (Sort of) Kidding • Commit part (just part) of a file • git add -p