Basic Principles of Git

Vo Huy Phuong

Basic Principles of Git

• What is Git

• Basic Operation with Git and How Git organize data.

• What is Branch and basic operation with branch

• Repository and Remote Branch

What is Git

• What is Version Control System– System that record the changes of a file or set of

file overtime.

• How many kind of Version Control system:– Centralized Version Control System– Distributed Version Control System

• Git and SourceTree

Centralize Version Controll System

Distributed Version Controll System

What is Git

• Git is distributed Version Control System

• Provide a rich, full command line for user to manipulate data.

• SourceTree is application, provide a visual interface for user to do with Git system.

Basic Operation and How Git organize data

• Organize data into a three State:– Git directory(repository)– Working Directory– Stage Area

How Git organize data

How Git organize data

• How Repository organize data– Organize data into Tree– Has many leafs(commit object) that link together– Each commit has a snapshot of file/set of file that

changed• An HEAD pointer to indicate the current status

we are on• HEAD pointer will move forward if we commit

How Repository organize data

How Repository organize data

How Repository organize data

Basic Operation

• Some basic operation– Git Add : add file to State area– Git Checkout : reset the changed file in Working

area– Git Reset : reset HEAD to specific commit– Git Status : view the status of Working Area, and

State Area

Basic Operation

• Some basic operation– Git rm : deleted a file from repository– Git Commit: create the commit obj from the State

Area..and update Tree– Git mv : move file from one location to another

location– Git Log: show history in repository

What is Branch and basic Operation with Branch

• Branch is one part of Git Tree• Permit User to work independently with

another branch• Branch is actually a movable pointer, that can

move forward or downward commit object in Git Tree

How Repository organize data

What is Branch and basic Operation with Branch

What is Branch and basic Operation with Branch

• Basic Operation with branch– Git checkout : create or change branch– Git merge : merge one branch with another

branch

Basic Merge in Branch

Basic Merge in Branch

Basic Merge Conflict

Repository

• Basic Operation with repository– Git fetch : Synchronize local database with server

database– Git clone : create new local database and create

working copy for all file

Remote Branch

• Remote Brach is movable pointer that represent the current status of this branch on server

• Git has difference pointer for one branch:1 for remote branch and 1 for local branch

• Operation in Branch:– Git merge : merge one branch with another branch– Git pull : fetch one branch and merge local branch

with remote branch– Git Push : push branch data to remote repository

Remote Branch

Remote Branch

Basic Principles in Git

• Reference : http://git-scm.com/book