This document introduces version control systems, including local (LVCS), centralized (CVCS), and distributed (DVCS) systems. It focuses on explaining Git, a popular DVCS, covering its origins, advantages over other systems like storing snapshots instead of file changes, basic commands and concepts like the three main states (committed, modified, staged), and how to install and use Git on different platforms like Windows, Mac and Linux.

1. 2 0 1 4 . 1 1 . 1 9 WI L L IAM WANG
VERSION CONTROL :
GI T
1

2. WHAT IS VERSION CONTROL
2

3. LOCAL VERSION CONTROL
SYSTEMS
A simple database that kept
all the changes to files under
revision control
3

4. CENTRAL I ZED VERSION
CONTROL SYSTEMS
LVCS PROBLEM:
People need to collaborate with
developers on other systems.
CVCS SOLUT ION:
A single server that contains all the
versioned files, and a number of
clients that check out files from that
central place.
4

5. DISTRIBUTED VERSION
CONTROL SYSTEMS
LVCS,CVCS PROBLEM:
Whenever you have the entire
history of the project in a single
place, you risk losing everything.
DVCS SOLUT ION:
In a DVCS (such as Git, Mercurial,
Bazaar or Darcs), clients don’t just check
out the latest .snapshot of the files: they
fully mirror the repository.
5

6. INTRODUCE GI T
• The origin of all things - Linux Kernel (1991–
2002)
• From BitKeeper to Git(2005)-Linus Torvalds
(Linux Creator) and the community develop their
own tool based on some of the lessons they
learned while using BitKeeper.
• Fast Speed(write in C)、Simple Design、Strong
support for non-linear development(Thousands
of parallel branches) 、Fully Distributed、Able
to handle large projects
• Who use git for developing?
• Eclipse,RoR,Android,jQuery,PHP……

7. OTHER VCS
MOST OTHER SYSTEMS STORE INFORMAT ION AS A L IST OF
F I LE-BASED CHANGES
7

8. GI T
1 .EVERY T IME YOU COMMI T , OR SAVE THE STATE. I T BASICAL LY TAKES
A PICTURE OF WHAT AL L YOUR F I LES LOOK L IKE AT THAT MOMENT
AND STORES A REFERENCE TO THAT SNAPSHOT .
2 . I F F I L E S H A V E N O T C H A N G E D , G I T D O E S N ’ T S T O R E T H E F I L E A G A I N ,
JUST A L INK TO THE PREVIOUS IDENT ICAL F I LE I T HAS ALREADY
STORED.
3 .GI T THINKS ABOUT I TS DATA MORE L IKE A STREAM OF SNAPSHOTS.
8

9. GI T BASICS
• Nearly Every Operation Is Local
• You have the entire history of the project right there on your local disk.
• Git Has Integrity
• Everything in Git is check-summed before it is stored and is then
referred to by that checksum.
• Git uses SHA-1 hash for checksumming and it calculated based on the
contents of a file or directory structure in Git.
Looks like: 24b9da6552252987aa493b52f8696cd6d3b00373
• Git Generally Only Adds Data
• The Three States

10. GI T BASICS - THE THREE STATES
• Three main sections of a Git project: Git directory, Working directory, Staging area.
• Three main states that your files can reside in: Committed, Modified, Staged.
• Committed means that the data is safely stored in your local database.
• Modified means that you have changed the file but have not committed it to your database yet.
• Staged means that you have marked a modified file in its current version to go into your next
commit snapshot

11. I N S T A L L G I T ( M A C , L I N U X … )
• Mac OS X
• OS X has default git, so if you want to get the latest
version, you can use some pkm(mac ports,homebrew…)
• Linux
• Debian-based:#apt-get install git
• Redhat-based:#yum install git
• …
11

12. INSTAL L GI T (WINDOWS)
12

13. INSTAL L GI T (WINDOWS)
13

14. INSTAL L GI T (WINDOWS)
14

15. INSTAL L GI T (WINDOWS)
15

16. INSTAL L GI T (WINDOWS)
16

17. INSTAL L GI T (WINDOWS)
17

18. INSTAL L GI T (WINDOWS)
18

19. INSTAL L GI T (WINDOWS)
19

20. INSTAL L GI T (WINDOWS)
20

21. INSTAL L GI T (WINDOWS)
21

22. GI T COMMAND
mkdir helloGit
cd helloGit
git init

23. GI T COMMAND
echo ‘Hi,git’> README.md
git status
git add READE.md
git status
git commit -m ‘First commit with README’
git status
23

24. GI T COMMAND
git remote add origin URL
git push -u origin --all
GitHub大冒險by Muan@JSDC2014:
https://www.youtube.com/watch?v=5YX33tyJfOI&index=21&list=PL8dIIwCMF-SN8ZOY1NgSrj-WkYb112glF
Teaching Git and GitHub with Node.js by
Jessica@JSDC2014:
https://www.youtube.com/watch?v=vH8koy9DtLY&index=14&list=PL8dIIwCMF-SN8ZOY1NgSrj-WkYb112glF

25. GI T COMMAND
git branch
git branch newBranch
git branch
git checkout newBranch
echo ‘This is a newBranch edit’ >> README.md
git status
git add .
git commit -m ‘commite on newBranch and edit README.md’
git checkout master
echo ‘Try to make some confilts’ >> README.md
git add . && git commit ‘master edit before merge’
git merge newBranch
//Solve the conflict
git add .
git commit -m ‘We merge these two branches’
git push -u origin --all
25

26. TRY MORE
git clone [URL]
git checkout [commit hash value]
git rebase [branch name]
…
…
…
For you to reference:
http://blog.gogojimmy.net/2012/02/29/git-scenario/
http://www.draconianoverlord.com/git-workshop.html
http://isis.apache.org/contributors/git-cookbook.html
https://github.com/ulrich/useful-git-command
26

27. PRACT ICE:GI T I T
• git it:https://github.com/jlord/git-it
27

28. REFERENCE
Git:
http://git-scm.com/
CodeSchool Try Git:
https://www.codeschool.com/courses/try-git
ihower’s blog:
http://ihower.tw/git/
gugod’s blog:
http://gugod.org/2009/12/git-graphing/
唐維佋’s slides:
http://www.slideshare.net/pa4373/git-git-hub-34165878
Hsiao-Ting Yu’s slides:
http://www.slideshare.net/littlebtc/git-5528339
28

29. THANKS,
AND
HAPPY WI TH GI T