Brief introduction into to concepts of git and GitHub

1. Git-r-done
An Introduction into Git Version Control

2. First things first, what is Git?

3. Git is a version control system. It
tracks a file or set of files and
records changes. These can later
be reverted to a previous version.

4. Why should we care?
• Reversibility
• Concurrence
• History

5. Distributed vs. Centralized

6. There are other
options…

8. So, why Git?

9. • Fast
• Handle huge projects with ease
• Simple
• Fully Distributed
• Open Source (FREEEEEEE)

10. Installation
Let’s get down and dirty.

11. • Mac: brew install git or http://code.google.com/
p/git-osx-installer
• Linux: apt-get install git
• Windows: http://msysgit.github.com/

12. It’s a good idea to go ahead and:
!
git config —global user.name “Yo’Name”
git config —global user.email “Yo’Email”

13. Let’s git it going…
(go ahead… laugh)

14. There are two basic ways
to create a Git repository

15. Existing project
• cd into/project/folder
• git init
• This will create a git repository for your project
• At this point, files are not being tracked.

16. Clone a repo
• cd into/desired/folder
• git clone <url>
• The url here will will default to the origin of the
remote.
• Clean repo, all files that have been added are
being tracked.

17. Git works in three
basic states

18. Committed
Data is safely stored in the git repository

19. Modified
Data has been modified but it is yet to be committed.

20. Staged
Data has been marked to be committed

21. Git workflow

22. The Bread and Butter

23. • git status; check the status of the working
directory
• git add <options> <filename>; track/stage files
to be committed.
• git commit; Commit a git snapshot into a
repository.

24. Before we get ahead of
ourselves… most of the time, it’s a
good idea to initialize a .gitignore

25. .gitignore
• Control which files will be ignored when staging
• Add files that you want to ignore to this list
• *.x <— Ignores all files ending in .x
• For directories, end in ‘/’
• Basic bash patterns can be used.

26. Branches and
Merging

27. Branches
• git branch <name>; create a new branch
• git checkout <name>; switch HEAD to a branch
• git checkout -b <name>; create a branch and
switch to it.
• git branch; show a list of all the branches.

28. Merging
• git checkout master; first change into master
branch
• git merge <name-of-branch>; merge branch
with master branch

29. Hosting Services

30. If git init
• git remote add <name> <url>
• git push -u <remote> <branch>

31. Otherwise
• git pull
• git push

32. That’s basically it

33. Questions?