Working with Git and GitHub

An introduction to source control with Git and project collaboration using GitHub, from a presentation to Refresh DC on 2013 - 03 - 21. The slides were accompanied by live demos.

Transcript

1. Working with Git and GitHub. Work better, together.
2. My name is Matt Yoho. I write code at GitHub. @mattyoho
3. Git Distributed version control.
4. GitHub Social coding. Open source.
5. GitHub Creative project collaboration.
7. ? ? ?
8. So, what is version control?
9. So, what is version control? And why do I care?
10. Let’s look at a daily workflow.
11. 1. Create some files. 2. Save some files. 3. Edit some files. 4. Save them again.
12. 1. Create some files. 2. Save some files. 3. Edit some files. 4. Save them again.
13. 1. Create some files. 2. Save some files. 3. Edit some files. 4. Save them again.
14. 1. Create some files. 2. Save some files. 3. Edit some files. 4. Save them again.
15. 1. Create some files. 2. Save some files. 3. Edit some files. 4. Save them again.
16. Where was I again?!
17. Alternatively...
18. Experimentation
19. X Experimentation
20. X Experimentation
21. X ? Experimentation
22. Repos and commits
23. Commits Commits capture the contents of a project’s files at a point in time. A repository contains all the commits for a project, and some other metadata.
24. Commits Commits capture the contents of a project’s files at a point in time. A repository contains all the commits for a project, and some other metadata. A commit is like a savepoint.
25. Stages of a file staged committed changed git add git commit edit
26. Creating a repo
27. $> mkdir ./my_project $> cd my_project $> git init . $> gitting started
28. $> git init . $> git add [--all] $> git mv $> git commit [--amend] $> add commands
29. $> git status $> git show $> git diff $> git log $> status commands
30. Undoing things
31. $> git add -u $> git rm $> git reset $> git revert $> undo commands
32. Branches
33. Master (branch) (m erge) Feature
34. Branching and merging
35. $> git branch $> git checkout [--branch] $> git merge $> branch commands
36. The .git directory .git 6effec72 813a7a9c 071ae029
37. So, what’s the deal with GitHub?
38. So, what’s the point of GitHub? Octocloud
39. Working with remotes
40. $> git remote $> git push $> git fetch $> git pull $> remote commands
41. Git through the web UI
42. That’s neat and all, but what about the collaboration stuff?
43. Forking
44. Pull Requests
45. Pull Requests 
46. Forks, issues, and PRs
47. Master O pen P R M erge P R Feature
48. Master merge commit Log view
49. Git tricks
50. Rebasing commits
51. GHforM GHforW
52. Further Learning
56. Thank you. http://git-scm.com/ http://mac.github.com/ http://windows.github.com/ http://training.github.com/ http://help.github.com/
57. Thank you. Questions? http://git-scm.com/ http://mac.github.com/ http://windows.github.com/ http://training.github.com/ http://help.github.com/