Advanced Git

This presentation covers best practices, branching and the command line. I recommend looking through my Basic Git presentation before viewing this one.

Transcript

1. ++
2. best practices
3. commit messages
4. 'stuff' 'damnit git' 'sadfsadafklasjf' 'a' 'fixed a bug' 'added a feature'
5. "added a User object to the database. currently only has a name and an email. no authentication yet." "fixes the bug that would add 1337 to everything. turns we shouldn't add 1337 to everything."
6. Github Issue Tracker Integration "fixes #1337" » closes issue 1337 » fixes, fix, fixed » closes, close, closed
7. "#add a feature. @bill please stop sleeping" #refactor #fix
8. git branch
9. master
10. keep master running (no excuses)
11. need to add a feature? fix a bug?
12. master feature git branch feature git checkout feature Protip™: git checkout -b feature
13. when it's ready merge into master
14. master feature git merge feature master Protip™: git branch to see branches
15. branching is cheap (do it)
16. painless development: branch, work, delete the branch if it doesn't work
17. that's branching
18. $ command line Protip™: CLI
19. $ cat cli-tutorial Protip™: cat meows files
20. it's just like coding one line at a time
21. an example command
22. ls lists all files in the current directory Noobtip™: dir on Windows
23. {~} $ ls dev downloads music graphics tmp file.txt cats.png
24. ls -a directory/ command options arguments
25. {~} $ man ls -a: all files (even hidden) -l: long, extra data Protip™: ls -R / (h4ckz0rz)
26. more commands
27. pwd print working directory Protip™: terminals start at home, or ~
28. {~} $ pwd /home/aasen
29. cd change the current directory
30. {~} $ pwd /home/aasen {~} $ ls downloads {~} $ cd downloads/ {~} $ pwd /home/aasen/downloads {~} $ ls nothing to see here...
31. cp copies a file
32. {~} $ cp cats.png awesome.png Protip™: always use the first search result
33. mv moves a file
34. {~} $ mv awesome.png wtf.png
35. rm removes a file
36. {~} $ rm wtf.png Protip™: sudo rm -rf / (free bricks!)
37. sudo super user (god) do
39. lets you do anything anything Protip™: real men run as root
40. congrats, now you're a h4k3r!
41. git is a command too
42. Google!
43. GitGoodies™ (some time in the future)
44. Lane Aasen http://aasen.in laneaasen on Github @aaaasen