Prepping Commits

Git is like a very sharp knife: it's a powerful tool, but you can hurt yourself badly if you're not careful.

Transcript

1. Alex Tercete @alextercete Prepping Commits
13. $ git add . $ git commit -m '<message>'
14. Please stop killing Git fairies
15. $ git status $ git diff $ git add -p $ git diff --staged $ git commit
16. $ git add -p $ git commit --amend
17. $ git add -p $ git commit -m 'fixup! <commit-ref>' $ git rebase -i <base-ref> $ git show <new-commit-ref>
18. $ git mergetool $ git diff --staged $ git rebase --continue
19. Alex Tercete @alextercete Thanks!
20. Credits mr.smashy https://www.flickr.com/photos/wmode/2322459915 Juraj Sedlák https://thenounproject.com/term/santoku/892545/