Some useful git fu I put together for a talk targeting my co-workers

1. advanced™ git features
and how to survive vim

2. git makes it
insanely git features
advanced™
hard
and how to survive vim
too lose
code

3. every commit is a full
snapshot!
No deltas – for fuck sake

4. A branch is nothing more
than a name for a specific
commit

5. the HEAD is just a pointer
to where your working
directory should currently
be on

6. the reflog is a history of all
movements of the HEAD

7. commits in the reflog that
are not reachable by any
branch will be gc‘ed after
30 days

8. Noticed you
are on the
wrong branch?

9. git got your back!
git checkout –b newBranch
git checkout previousBranch
git reset –hard lastValidCommit

10. ..or relative
git checkout –b newBranch
git checkout previousBranch
git reset –hard HEAD~1

11. “
„

12. commit early & often
yet nobody want‘s to read
this!

13. git rebase –i 6f50a39~1
this is what people should see

14. Need the last
five commits
from branch <foo>
without merging any
previous commits?

15. git cherry-pick first~..last

16. avoid unnecessary merges

17. use a rebase workflow
because

18. Face it, here is what happens if
you merge blindly
- your history becomes a mess
- you hide information in merge
commits
- harder to do git bisect
- harder to do cherry-picking

19. Face it, here is what happens if
you merge blindly
- your history becomes a mess
- you hide information in merge
commits
- harder to do git bisect
- harder to do cherry-picking

20. make the console your friend
//commit ALL THE THINGS for fuck sake!
git config --global alias.ca '!git add -A && git commit'
//we don‘t need a gui log!
git config --global alias.lg 'log --pretty=oneline --abbrev-
commit --graph --decorate'

21. Useful links!
http://www.randyfay.com/node/91
http://stackoverflow.com/questions/457927/git-workflow-and-rebase-vs-
merge-questions

22. Get in touch.
http://twitter.com/cburgdorf
https://github.com/cburgdorf