UNDERSTANDING GIT            Chen, Zhongke             Mar 15, 2012              Confidential and Proprietary
HISTORY  SCCS/RCS              • Single File  (70~80)       VSS              • check-out/check-in       (90)              ...
WHAT’S GIT         distributed› Git is an open source   version control system designed for speed and  efficiency› Initial...
GIT CONCEPTS: REPOSITORY, REVISION,WORKING DIRECTORY, STAGE                             Confidential and Proprietary
EXERCISE 1›   git config --global user.name “zhongkchen”›   git config --global user.email zhongkchen@paypal.com›   git in...
GIT CONCEPTS: BRANCH AND MERGE 1                            Confidential and Proprietary
GIT CONCEPTS: BRANCH AND MERGE 2                            Confidential and Proprietary
GIT CONCEPTS: BRANCH AND MERGE 3                            Confidential and Proprietary
EXERCISE 2›   git   branch›   git   checkout›   git   merge›   git   branch -d› Advanced: git rebase, git cherry-pick     ...
GIT CONCEPTS: CLONE, FETCH, PUSH                             Confidential and Proprietary
EXERCISE 3› git   clone› git   fetch origin› git   merge› git   push origin master› git   pull› advanced:    – config file...
REFERENCE›   Intro to Distributed Version Control Illustrated›   Distributed Revision Control (Wikipedia)›   Pro Git›   Te...
Upcoming SlideShare
Loading in...5
×

Git General

662

Published on

Published in: Technology
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total Views
662
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
7
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Git General

  1. 1. UNDERSTANDING GIT Chen, Zhongke Mar 15, 2012 Confidential and Proprietary
  2. 2. HISTORY SCCS/RCS • Single File (70~80) VSS • check-out/check-in (90) • update/commit Centralized CVS (90) SVN • atomic commit (00) TeamWare,BitKeeper, • Distributed? GIT,Mercurial,Bazaar (00) Confidential and Proprietary
  3. 3. WHAT’S GIT distributed› Git is an open source version control system designed for speed and efficiency› Initial developed by Linus Torvalds› Used by e.g. Linux kernel and Ruby on Rails, Android Confidential and Proprietary
  4. 4. GIT CONCEPTS: REPOSITORY, REVISION,WORKING DIRECTORY, STAGE Confidential and Proprietary
  5. 5. EXERCISE 1› git config --global user.name “zhongkchen”› git config --global user.email zhongkchen@paypal.com› git init # create a new repository› git add # add file to stage› git rm› git mv› git commit # commit files from stage to repo› git status # check the status of working dir and stage› git log # check history in repo› git diff # compare working dir with stage› git diff --cached # compare stage with the repo› .gitignore # a special file› Advanced: git stash, git blame, git reset, git revert Confidential and Proprietary
  6. 6. GIT CONCEPTS: BRANCH AND MERGE 1 Confidential and Proprietary
  7. 7. GIT CONCEPTS: BRANCH AND MERGE 2 Confidential and Proprietary
  8. 8. GIT CONCEPTS: BRANCH AND MERGE 3 Confidential and Proprietary
  9. 9. EXERCISE 2› git branch› git checkout› git merge› git branch -d› Advanced: git rebase, git cherry-pick Confidential and Proprietary
  10. 10. GIT CONCEPTS: CLONE, FETCH, PUSH Confidential and Proprietary
  11. 11. EXERCISE 3› git clone› git fetch origin› git merge› git push origin master› git pull› advanced: – config file – git remote Confidential and Proprietary
  12. 12. REFERENCE› Intro to Distributed Version Control Illustrated› Distributed Revision Control (Wikipedia)› Pro Git› Tech Talk: Linus Torvalds on git Confidential and Proprietary
  1. A particular slide catching your eye?

    Clipping is a handy way to collect important slides you want to go back to later.

×