Git

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Source Control.
Git Introduction
IT Academy
01/22/2015

Agenda
▪Source Control Tools
– File Server, CVS, VSS, TFS, Perforce, Git, etc.
▪Source Management Models
▪Git. Introductio...

Source Control Tools

History. File Server
▪ File server is a computer attached to a network that has the
primary purpose of providing a locatio...

CVS
▪ The Concurrent Versions System (CVS), also known as the
Concurrent Versioning System, is a free software revision
(G...

VSS
▪ Microsoft Visual SourceSafe (Visual SourceSafe, VSS) – is a
source control software package oriented towards small
s...

TFS
▪ Microsoft introduced a source control and project lifecycle
management product called Team Foundation Server, which
...

SVN
▪ Apache Subversion (name SVN) is a revision control system
founded and sponsored in 2000 by CollabNet Inc.
▪ Develope...

Subversion

History. Git
▪ Git is a distributed revision control and source code
management (SCM) system

Source Management Models

Repository
▪ Repository is a kind of file server, but it's not your usual
breed.
▪ What makes the repository special is th...

Repository

Problem of File-Sharing
▪ All version control systems have to solve the same
fundamental problem: how will the system allo...

Problem of File-Sharing
▪ Suppose we have two co-workers, Harry and Sally. They each
decide to edit the same repository fi...

Problem of File-Sharing

Lock-Modify-Unlock Solution
▪ Many version control systems use a lock-modify-unlock model
to address the problem of many a...

Lock-Modify-Unlock Solution

Lock-Modify-Unlock Solution
▪ The problem with the lock-modify-unlock model is that it's a
bit restrictive, and often beco...

Lock-Modify-Unlock Solution
▪ Locking may cause unnecessary serialization. What if Harry is
editing the beginning of a tex...

Copy-Modify-Merge Solution
▪ Subversion, CVS, and many other version control systems use
a copy-modify-merge model as an a...

Copy-Modify-Merge Solution
▪ Say that Harry and Sally each create working copies of the
same project, copied from the repo...

Copy-Modify-Merge Solution

Copy-Modify-Merge Solution
▪ But what if Sally's changes do overlap with Harry's changes?
This situation is called a confl...

Copy-Modify-Merge Solution
▪ The copy-modify-merge model may sound a bit chaotic, but in
practice, it runs extremely smoot...

Copy-Modify-Merge Solution

Locking
▪ While the lock-modify-unlock model is considered generally
harmful to collaboration, there are still times when ...

Git. Introduction

Git. Client
▪ http://git-scm.com/downloads

Git. Client
▪ http://msysgit.github.io/

Git. Client
▪ Path Dialog

Git Repositories

Git. Create Repository
▪ Signing up for a new GitHub account
https://github.com/signup/free
▪ Create Repository, and Run G...

Git. Create Repository
▪ Add .gitignore: Java

Register
▪ Register your name and e-mail in git
$ git config --global user.name
"<desired name to be seen as author of cod...

Git Workflow

Git Workflow

Git. Clone
▪ Run cmd
C:...User>cd workspace
▪ Clone repository
$ git clone
https://github.com/lv136/atqc.git

Git. Clone
▪ Create (copy) maven project
▪ Import to Eclipse

Git. Remote Repository
▪ Displaying remote repositories (with URL)
$ cd atqc136
$ git remote
$ git remote -v
▪ Adding a re...

Git. Remote Repository
▪ Get data (branch) from remote projects
$ git fetch [servername]
▪ Branches can be viewed or merge...

Git. Ignoring. File .gitignore
▪ Empty lines and beginning with # are ignored
▪ Standard glob patterns
▪ End patterns with...

Git. Ignoring. File .gitignore
C:UsersUserworkspaceatqc136>git status
On branch master
Your branch is up-to-date with 'ori...

Git. Status of Files
▪ Create new file README
$ git status
▪ Tracking the file README
$ git add README
$ git status
▪ Edit...

Git. Compare Content
▪ What changed: compares the contents of the directory with
the contents of the index
$ git diff
▪ Th...

Git. Formatting Commits
▪ Set variable
$ set GIT_EDITOR=notepad
$ git config --global core.editor "notepad"
▪ Add all
$ gi...

Git. Delete
▪ Deleting files and add to index
$ rm README
$ git status
$ git rm
$ git status
▪ Delete file from index (lea...

Git. History Commit
▪ View commit history
$ git log
▪ Parameter -p shows the difference and output last 2 records
$ git lo...

Git. Changes
▪ Cancel indexing file
$ git status
$ git reset HEAD README
▪ Undo Changes file (merge, conflict)
$ git check...

Branching Philosophy

Git. Branches
▪ Create a new branch
$ git branch testing
▪ Switched to branch (-b create)
$ git checkout testing
$ git che...

Git. Merge
▪ We’ve been working hard on that testing branch.
▪ After another commit, it’s looking so sweet we’ve decided i...

Git. Conflict
<<<<<<< HEAD:index.html
<div id="footer">contact : email.support@github.com</div>
=======
<div id="footer">
...

Git. Back Changes
▪ Cancel last commit
$ git reset --soft HEAD
▪ Delete last commit (change workspace)
$ git reset --hard ...

Team Player Philosophy

Git
Command syntax Description
repo init initializes a new client
repo sync syncs client to repositories
repo start starts...

References
▪ Visual Git Reference
http://marklodato.github.io/visual-git-guide/index-en.html
▪ Everyday GIT Commands
https...

Git

Share Slideshare

LinkedIn
Facebook
Twitter

Embed

Size (px)

Show related Slideshows at end

WordPress Shortcode

Link

Share
Email

Berntsen -chicago_my_home_town_-_0... by Rosanna Goode 276 views
Green fax agm by Paul Green 404 views
pay it foward by gabydq 178 views
Green Fax Agm by Paul Green 220 views
Educ1751 Assignment 1 by AngelitaWijoyo 249 views
Logging by Марія Русин 819 views

View on Slideshare

1 of 58 Ad

View on Slideshare

1 of 58 Ad