Improve Your Development Process with Git

Improve Your Development Process with Git Lachlan Hardy @lachlanhardy

What is Git? • Open source

What is Git? • Open source • Distributed version control system

What is Git? • Open source • Distributed version control system • Designed for speed and efficiency

What is Git? Open source - git-scm.com

What is Git? Distributed • local copy is a full copy

What is Git? Distributed • local copy is a full copy • local copy is a backup

What is Git? Distributed • local copy is a full copy • local copy is a backup • commit to local copy

What is Git? Distributed • local copy is a full copy • local copy is a backup • commit to local copy • work offline

What is Git? Work offline • perform diffs

What is Git? Work offline • perform diffs • commit changes

What is Git? Work offline • perform diffs • commit changes • switch branches

What is Git? Work offline • perform diffs • commit changes • switch branches • merge branches

What is Git? Speed and Efficiency • Snapshots, not deltas

What is Git? Speed and Efficiency • Snapshots, not deltas • Commit-based logic

What is Git? Speed and Efficiency • Snapshots, not deltas • Commit-based logic • Each commit has access to full history

Setting up a repository Configuration • $ git config --global user.name “Lachlan Hardy” • $ git config --global user.email “lhardy@atlassian.com”

Setting up a repository Create • $ cd example/ • $ git init • master $ touch README • master $ git add . • master $ git commit -m “This is my ﬁrst commit.”

Setting up a repository Clone • $ git clone git://example.com/repository/ example.git • $ cd example/

Developer Workﬂow • Topic Branching

Developer Workﬂow • Topic Branching • Commit work locally

Developer Workﬂow • Topic Branching • Commit work locally • Update local copy

Developer Workﬂow • Topic Branching • Commit work locally • Update local copy • Merge work to trunk and push to server

Developer Workﬂow Topic Branching • master $ git pull origin master

Developer Workﬂow Topic Branching • master $ git pull origin master • master $ git checkout -b new-feature

Developer Workﬂow Topic Branching • master $ git pull origin master • master $ git checkout -b new-feature • new-feature $ ...do some stuff...

Developer Workﬂow Commit work locally • new-feature $ git status

Developer Workﬂow Commit work locally • new-feature $ git status • new-feature $ git add changed-ﬁle.txt

Developer Workflow Commit work locally • new-feature $ git status • new-feature $ git add changed-file.txt • new-feature $ git commit -a “I changed a file”

Developer Workﬂow Update local copy • new-feature $ git checkout master

Developer Workﬂow Update local copy • new-feature $ git checkout master • master $ git pull origin master

Developer Workﬂow Merge work to trunk and push to server • master $ git merge new-feature

Developer Workﬂow Merge work to trunk and push to server • master $ git merge new-feature • master $ git push origin master

Working in a team • Work locally

Working in a team • Work locally • Share work without a server

Working in a team • Work locally • Share work without a server • Test code locally in isolation

Working in a team • Work locally • Share work without a server • Test code locally in isolation • Commit to the server without breaking builds

Working in a team • Work locally • Share work without a server • Test code locally in isolation • Commit to the server without breaking builds • A broken build doesn’t stop development

Questions? • lachlan@lachstock.com.au • @lachlanhardy • http://git-scm.com/

Improve Your Development Process with Git

by Lachlan Hardy on May 06, 2010

Accessibility

Categories

Tags

Upload Details

Usage Rights

2 Embeds 20

Statistics

Improve Your Development Process with Git — Presentation Transcript

http://www.slideshare.net	18
http://www.lmodules.com	2