中国人民大学：《程序设计实践》课程教学资源（讲稿）Fundamentals of Git

Fundamentals of git PPT By Zachary Ling CUHK 1

Fundamentals of Git PPT By Zachary Ling CUHK 1

Outline 。History of Git Distributed V.S Centralized Version Control 。Getting started Branching and Merging ·Vorking with remote 。Summary 2

Outline • History of Git • Distributed V.S Centralized Version Control • Getting started • Branching and Merging • Working with remote • Summary 2

A Brief History of Git Linus uses BitKeeper to manage Linux code Ran into BitKeeper licensing issue Liked functionality Looked at CVS as how not to do things April 5,2005-Linus sends out email showing first version June 15,2005-Git used for Linux version control

A Brief History of Git • Linus uses BitKeeper to manage Linux code • Ran into BitKeeper licensing issue – Liked functionality – Looked at CVS as how not to do things • April 5, 2005 - Linus sends out email showing first version • June 15, 2005 - Git used for Linux version control 3

Git is Not an SCM Never mind merging.It's not an SCM,it's a distribution and archival mechanism.I bet you could make a reasonable SCM on top of it, though.Another way of looking at it is to say that it's really a content-addressable filesystem,used to track directory trees. Linus Torvalds,7 Apr 2005 http://Ikml.org/lkml/2005/4/8/9

Git is Not an SCM Never mind merging. It's not an SCM, it's a distribution and archival mechanism. I bet you could make a reasonable SCM on top of it, though. Another way of looking at it is to say that it's really a content-addressable filesystem, used to track directory trees. Linus Torvalds, 7 Apr 2005 http://lkml.org/lkml/2005/4/8/9 4

Centralized Version Contro Traditional version control system -Server with database Clients have a working version 。Examples -CVS Subversion -Visual Source Safe ·Challenges Multi-developer conflicts Client/server communication

Centralized Version Control • Traditional version control system – Server with database – Clients have a working version • Examples – CVS – Subversion – Visual Source Safe • Challenges – Multi-developer conflicts – Client/server communication 5

Distributed Version Control ·Authoritative server by·Other distributed convention only systems include Every working checkout Mercurial is a repository BitKeeper ·Get version control Darcs even when detached Bazaar 。Backups are trivial 6

Distributed Version Control • Authoritative server by convention only • Every working checkout is a repository • Get version control even when detached • Backups are trivial • Other distributed systems include – Mercurial – BitKeeper – Darcs – Bazaar 6

SoS mercurial (hg) bazaar subversion(svn) version control concurrent version system(cvs) perforce visual source safe

7

mercurial (hg)"not bad" SoS bazaar subversion (svn) version control concurrent version system(cvs) perforce visual source safe

8

SoS mercurial (hg) bazaar subversion(svn) version control concurrent version system(cvs) perforce visual source safe "kill self

9

git mercurial (hg) bazaar subversion(svn) version control concurrent version system(cvs) perforce visual source safe 10

10