The document introduces Git, an open source version control system. It discusses what Git is, how to install it on different operating systems, and some basic Git commands like add, commit, branch, merge, push and pull. It also provides an overview of the GitHub flow for collaborating on projects hosted on GitHub. Resources for learning more about Git and version control are listed at the end.

1. Hello git :)

2. <me>
Josh Dvir
josh@tooveo.com
@shukydvir
</me>
Founder & CTO @

3. Get git:
Mac: $ brew install git
Linux: $ apt-get install git-core
Windows: msysgit

4. version control

5. CVS or SVN

6. mercurial (hg)
bazaar
subversion (svn)
concurrent version system (cvs)
preforce
visual source safe

7. “not bad”mercurial (hg)
bazaar
subversion (svn)
concurrent version system (cvs)
preforce
visual source safe

8. “kill self”
mercurial (hg)
bazaar
subversion (svn)
concurrent version system (cvs)
preforce
visual source safe

9. mercurial (hg)
bazaar
subversion (svn)
concurrent version system (cvs)
preforce
visual source safe
git

10. What is git?

11. git is an open source,
distributed version control
system designed for speed
and efficiency

12. Who uses git?

13. git is an open source,
distributed version control
system designed for speed
and efficiency

14. git-scm.com

15. git is an open source,
distributed version control
system designed for speed
and efficiency

16. Fully Distributed

17. (almost) everything is local

18. everything is fast
every clone is a backup
work offline

19. No Network Needed
Performing a diff
Viewing file history
Committing changes
Merging branches
Obtaining other revisions of a file
Switching branches

21. git is an open source,
distributed version control
system designed for speed
and efficiency

22. (almost) never removes data

23. Snapshots, not Patches

25. Starting with git

26. $ git config --global user.name “Josh Dvir”
$ git config --global user.email “josh@tooveo.com”

27. Getting a repo

28. Create One:
$ git init

29. Clone One:
$ git clone

30. Basic commands:
● Add a file (git add)
● Commit changes (git commit)
● See logs (git log)
● Remove a file (git rm)
● Jump to commit or branch (git checkout)
● Create branch (git branch branch_name)
● Put aside temporary changes (git stash)
● Merge branches (git merge)
● Push commits (git push)
● Pull commits (git pull)

31. Workshop
start your laptops...

32. git init
$ cd /path/to/repos
$ mkdir project_name
$ cd project_name
$ git init
$ ls -alh

33. git add
$ touch README
$ echo “Read Me” >> README
$ echo “Learn git!” > TODO
$ git add . # will add all files

34. git status
$ git status

35. $ git commit -m “Adding 2 files”
# TODO and README committed to git.
$ git status # no changes
git commit

36. git branch
$ git branch my_awesome_branch
$ echo “dude file changed” >> README
$ git status
# README is staged to commit.
$ git commit -m “README has changed”

37. git checkout
$ git checkout master

38. git merge
$ git merge my_awesome_branch
$ git log
# see the new commit

39. github.com
bitbucket.org
code.google.com

40. $ git remote add origin git@github.com:username/project.git
git remote

41. $ git push origin master
$ git push other_remote master
$ git push third_remote my_awesome_branch
git push

42. $ git pull origin master
$ git pull other_remote master
git pull

43. github flow

44. ● Anything in the master branch is deployable
● To work on something new, create a descriptively named
branch off of master
● Commit that branch locally and regularly push your work
to the same named branch on the server.
● When you need feedback or help, or you think the branch
is ready for merging, open a pull request.
● After someone else has reviewed and signed off on the
feature, you can merge it into master
● Once it is merged and pushed to master, you can and
should deploy immediately.

45. 1. http://git-scm.com/
2. http://www.slideshare.net/chacon/git-101-
presentation
3. http://scottchacon.com/2011/08/31/github-
flow.html
4. http://rogerdudler.github.io/git-guide/
5. http://gitimmersion.com/
Resources: