This document provides an overview of version control and the basics of using Git. It discusses why backups are important, how version control works, and how to install and set up Git. It then covers basic Git commands and workflows for creating repositories, cloning repositories, staging and committing changes, branching and merging, tagging releases, ignoring files, resolving conflicts, and working in a distributed environment.

1. in 5 minutes
r2d.to/gitstart

2. BACKUPS ARE
REALLY F**KING
IMPORTANT
photo credit: alexander muse (flic.kr/p/noL2K)

3. snapshots

4. snapshots

5. version control
✓ what files have changed
✓ who made those changes
✓ when the changes were made
✓ how those changed files differ
✓ why they were changed
(hopefully)

6. wikipedia
record of changes
to articles over
time

7. git-scm.com

8. what’s so great about git?
✓ free & open source
✓ local & distributed
✓ fast & secure
✓ stable & popular

9. getting git
baked right in installing it
use homebrew
mxcl.github.com/homebrew
textmate eclipse
bundle plugin use apt-get or yum
a nd download it
xcode mo re ! git-scm.com/downloads

10. what’s so great about git?
✓ free & open source
✓ local & distributed
✓ fast & secure
✓ stable & popular

11. create/ 1
basic workflow
clone
repository commit
2 4 changes
make
changes
3
stage changes

12. work area
git
stage
photo credit: muy yum (flic.kr/p/7ByV6Y)

13. git basics

14. creating a repository
$
cd
myproject
$
git
init

15. myproject/.git/
don’t touch these files!

16. cloning a repository folder or URL
$
git
clone
https://github.com/
progit/progit.git
the location can be a folder or url

17. staging changes
$
git
add
myfile.html
$
git
add
css/*
you have to stage your changes
each time you commit!

18. committing changes
$
git
commit
-­‐m
"Added
new
file,
myfile.html,
to
repo."

19. other commands
$
git
log
$
git
diff
a65fe40
$
git
rm
$
git
mv commit hash

20. .gitignore
source/*
*.temp
nuclear-­‐launch-­‐codes.txt
put files, folders and patterns in
this file to tell git to ignore them.

21. branching & merging
master
development
feature

22. branching
1. create child branch
2. check out child branch
3. work on new branch
$
git
branch
child
$
git
checkout
child

23. merging
1. check out parent branch
2. merge child branch into parent
$
git
checkout
parent
$
git
merge
child

24. the ‘stache

25. the ‘stache

26. the stash
$
git
stash
$
git
stash
apply
$
git
stash
list
$
git
stash
drop
STASH_ID

27. master
tagging v1.0
development
$
git
tag
-­‐a
v1.0
-­‐m
"Product
release"
$
git
tag
-­‐a
ronburgundy
-­‐m
"Brick
killed
a
guy
with
a
trident."

28. distributed git
developer
shared
developer
repository
developer
$
git
pull
origin
master
$
git
push
origin
master

29. thank you, code4lib!
r2d.to/gitstart
rob dumas
chicago public library
@stray