Git is a free, distributed version control system that is fast, easy to learn, and has great features like cheap local branching and convenient staging areas. It has also taken the open source world by storm, especially with the help of online services like GitHub. Learn 20 essential commands that will help you work with your next project, as well as common conventions and workflows.

1. 20 Essential Commands

2. Oh Hai! I'm Jeremy Lindblom!
Ø I work on the AWS SDK for PHP at
Ø Co-organizer of the Seattle PHP Meetup Group
Ø B.S. in Computer Science from
Ø @jeremeamia on

3. Intro to Version Control

4. Version Control
• Also Source Control or Revision Control
• “any practice that tracks and provides
control over changes to source code”[1]
• Version control systems ( VCS )
– Git
– SVN
– CVS
– Mercurial
– Perforce
– Clear Case

5. Vocabulary – Part 1
• Repository | Repo – Set of current & past
data about the files under version control
• Revision | Version | Commit – A tracked
change to the repo
• Working Copy – Local copy of the repo at
a specific revision
• Head | Tip – The most recent revision

6. Vocabulary – Part 2
• Trunk | Mainline | Master – The main
development path of the repo
• Branch – A divergent development path
of the repo for features, fixes, etc.
• Merge – Integrate revisions from a
branch back into trunk or other branch
• Tag – A name or label given to a revision

7. Centralized VCS
[2]

8. Distributed VCS (DVCS)
[2]

9. Git
• A fast, distributed VCS
• Free and open source
• Easy to learn
• Cheap branching
• Staging area
• Local operations

10. Who is Using Git?
• Facebook
• Microsoft
• Google
• Amazon
• Twitter
• Netflix
• LinkedIn
• Zynga
• Linux
• Android
• Ruby on Rails
• Eclipse

11. 20 Essential Commands

12. Getting Started
#1.
git
config
#2.
git
help

13. Getting a Repo
#3.
git
clone
#4.
git
init
#5.
git
remote
#6.
git
fetch

14. Multiple Remotes
AWS SDK for PHP

15. Workflow for Making Changes

16. Making Changes
#7.
git
pull
#8.
git
status
#9.
git
add
#10.
git
commit
#11.
git
push

17. Git Takes Snapshots

18. Examining Changes
#12.
git
log
#13.
git
diff

19. Undoing Changes
#14.
git
reset
-­‐-­‐hard
#15a.
git
rm
#15b.
git
rm
-­‐-­‐cached
#16.
git
clean
-­‐fd

20. Branching
[3]

21. Branching
#17a.
git
branch
#17b.
git
branch
-­‐d
#18.
git
checkout
#19.
git
merge

22. Tagging a Release
#20.
git
tag
#11b.
git
push
-­‐-­‐tags

23. Tools,Workflows, & GitHub

24. Git Hosting
Third-party hosting
• GitHub
• Gitorious
• Bitbucket
• SourceForge
• Google Code
• CodePlex
Self-hosting
• Gitolite
• Gitosis

25. Git GUIs
• git-gui + gitk
• GitHub for Mac, GitHub for Windows
• Tower
• GitBox
• SourceTree
• TortoiseGit
• Your IDE

26. Popular Workflows
• git-flow – http://nvie.com/posts/a-
successful-git-branching-model/
• Github Flow – http://scottchacon.com/
2011/08/31/github-flow.html

27. git-flow
[4]

28. AWS SDK for PHP’s Workflow

29. GitHub
[5]

30. GitHub Features
• Nice web interface
• Facilitates social coding
• Issue and milestone tracker
• Wikis and project pages
• Comments and code reviews
• Forking and Pull Requests (PRs)

31. .gitignore
• Can specify files, paths, or patterns for
Git to ignore (i.e., not track changes)
• Goes in the root of your repo
*.log
.DS_Store
Thumbs.db
vendor/

32. Wrapping It Up
• Git is a free and fast DVCS
• Git is really popular, especially for OSS
• You now know 20 Git commands
• There are lots of tools that support Git
• GitHub is an awesome Git host with
additional features like forking and PRs

33. Questions?
Presentation by Jeremy Lindblom – @jeremeamia

34. References
1. http://en.wikipedia.org/wiki/Revision_control
2. http://git-scm.com/book/en/Getting-Started-About-Version-Control
3. http://hades.name/blog/2010/01/22/git-your-friend-not-foe-vol-2-
branches/
4. http://nvie.com/posts/a-successful-git-branching-model/
5. https://github.com/aws/aws-sdk-php