Pragmatic Guide to Git

Pragmatic GuideGIT Travis Swicegood #gittalkLicensed under Creative Commons, Attribution, Share-Alike

#gittalkpragmatic guide to git by travis swicegood some rights reserved

Hi, I’m Travispragmatic guide to git by travis swicegood some rights reserved

pragmatic guide to git by travis swicegood some rights reserved

Git is Easypragmatic guide to git by travis swicegood some rights reserved

What’s this talk about?pragmatic guide to git by travis swicegood some rights reserved

What this talk isn’t about?pragmatic guide to git by travis swicegood some rights reserved

Contentspragmatic guide to git by travis swicegood some rights reserved

Starting Outpragmatic guide to git by travis swicegood some rights reserved

Daily Workpragmatic guide to git by travis swicegood some rights reserved

Branchespragmatic guide to git by travis swicegood some rights reserved

Team Workpragmatic guide to git by travis swicegood some rights reserved

Glossarypragmatic guide to git by travis swicegood some rights reserved

Starting Outpragmatic guide to git by travis swicegood some rights reserved

Installationpragmatic guide to git by travis swicegood some rights reserved

Installation–Compiling … download latest source from git-scm.com… prompt> make && make install … if you’re adventurous… prompt> make docs && make install-docspragmatic guide to git by travis swicegood some rights reserved

Installation–Ubuntu prompt> apt-get install git-core … optional … prompt> apt-get install git-doc git-svnpragmatic guide to git by travis swicegood some rights reserved

Installation–Windows Cygwin: http://cygwin.org msysGit: http://code.google.com/p/msysgit/pragmatic guide to git by travis swicegood some rights reserved

Installation–OS X prompt> brew install git –OR– Git OS X Installer: http://code.google.com/p/git-osx-installer/pragmatic guide to git by travis swicegood some rights reserved

Verifying the Install prompt> git --version git version 1.7.3.2pragmatic guide to git by travis swicegood some rights reserved

My Version prompt> git --version git version 1.7.3.2 hub version 1.4.1pragmatic guide to git by travis swicegood some rights reserved

Getting Helppragmatic guide to git by travis swicegood some rights reserved

Built-in Help prompt> git help prompt> git help <some command> prompt> open http://j.mp/gitdocs/pragmatic guide to git by travis swicegood some rights reserved

Configurationpragmatic guide to git by travis swicegood some rights reserved

User & Email prompt> git conﬁg --global user.name “Travis Swicegood” prompt> git conﬁg --global user.email “travis@domain51.com”pragmatic guide to git by travis swicegood some rights reserved

Colors prompt> git conﬁg --global color.ui autopragmatic guide to git by travis swicegood some rights reserved

Creating New Repositoriespragmatic guide to git by travis swicegood some rights reserved

Repositorypragmatic guide to git by travis swicegood some rights reserved

Commitpragmatic guide to git by travis swicegood some rights reserved

Initialization prompt> git init … example … prompt> mkdir /work/some-repo prompt> cd /work/some-repo prompt> git initpragmatic guide to git by travis swicegood some rights reserved

Working Treepragmatic guide to git by travis swicegood some rights reserved

Cloning New Repositoriespragmatic guide to git by travis swicegood some rights reserved

Cloning prompt> git clone <some repo> … example … prompt> git clone git://github.com/tswicegood/bobby-tables.git prompt> cd bobby-tablespragmatic guide to git by travis swicegood some rights reserved

Daily Workpragmatic guide to git by travis swicegood some rights reserved

Seeing What’s Changedpragmatic guide to git by travis swicegood some rights reserved

Status prompt> git status … example … prompt> git status # On branch master nothing to commit (working directory clean)pragmatic guide to git by travis swicegood some rights reserved

Staging Changespragmatic guide to git by travis swicegood some rights reserved

Indexpragmatic guide to git by travis swicegood some rights reserved

(aka) Staging Areapragmatic guide to git by travis swicegood some rights reserved

Adding a New File prompt> git status # On branch master # Untracked ﬁles: # (use "git add <ﬁle>..." to include in what… # # README.rstpragmatic guide to git by travis swicegood some rights reserved

Adding a New File prompt> git add README.rst prompt> git status # On branch master # Changes to be committed: # (use "git rm --cached <ﬁle>..." to unstage) # # new ﬁle: README.rstpragmatic guide to git by travis swicegood some rights reserved

Committing Changespragmatic guide to git by travis swicegood some rights reserved

Creating a Commit prompt> git commit -m “some great message” [master 600f084] some great message 0 ﬁles changed, 0 insertions(+), 0 deletions(-) create mode 100644 README.rstpragmatic guide to git by travis swicegood some rights reserved

Creating a Commit prompt> git commit -m “some great message” [master 600f084] some great message 0 ﬁles changed, 0 insertions(+), 0 deletions(-) create mode 100644 README.rst … or use the editor … prompt> git commitpragmatic guide to git by travis swicegood some rights reserved

Git’s Editor? GIT_EDITOR <-- environment var core.editor <-- set with git conﬁg --global VISUAL <-- environment var EDITOR <-- environment var vi <-- when all else failspragmatic guide to git by travis swicegood some rights reserved

Staging Changes (Part II)pragmatic guide to git by travis swicegood some rights reserved

Adding an Existing File prompt> git add README.rst prompt> git status # On branch master # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # # modified file: README.rstpragmatic guide to git by travis swicegood some rights reserved

Commit Existing File prompt> git commit -m “great message” README.rst [master 3dc20b0] great message 1 ﬁles changed, 1 insertions(+), 0 deletions(-)pragmatic guide to git by travis swicegood some rights reserved

Commit All Changes prompt> git commit -m “great message” -a [master be1b8dc] great message 1 ﬁles changed, 1 insertions(+), 0 deletions(-)pragmatic guide to git by travis swicegood some rights reserved

Adding Part of a File prompt> git add -p README.rst … editor launches …pragmatic guide to git by travis swicegood some rights reserved

Undoing Staged Changespragmatic guide to git by travis swicegood some rights reserved

Remove a Staged Change prompt> git reset HEAD README.rst M README.rstpragmatic guide to git by travis swicegood some rights reserved

Moving Filespragmatic guide to git by travis swicegood some rights reserved

Moving a File prompt> git mv README.rst README.txt prompt> git status # On branch master # Changes to be committed: # (use "git reset HEAD <ﬁle>..." to unstage) # # renamed: README.rst -> README.txtpragmatic guide to git by travis swicegood some rights reserved

Deleting Filespragmatic guide to git by travis swicegood some rights reserved

Deleting a File prompt> git rm README.txt rm README.txt prompt> git status # On branch master … # deleted: README.txtpragmatic guide to git by travis swicegood some rights reserved

Sharing Changespragmatic guide to git by travis swicegood some rights reserved

Sharing Changes (from 30,000 feet)pragmatic guide to git by travis swicegood some rights reserved

Sending Your Changes prompt> git push <remote> [<branch>] … example … prompt> git push origin masterpragmatic guide to git by travis swicegood some rights reserved

Grabbing Other’s Changes prompt> git pull <remote> [<branch>] … example … prompt> git pull tswicegood masterpragmatic guide to git by travis swicegood some rights reserved

Told ya… 30,000’pragmatic guide to git by travis swicegood some rights reserved

Branchespragmatic guide to git by travis swicegood some rights reserved

What’s a Branch?pragmatic guide to git by travis swicegood some rights reserved

Viewingpragmatic guide to git by travis swicegood some rights reserved

Viewing Branches prompt> git branch * masterpragmatic guide to git by travis swicegood some rights reserved

Creatingpragmatic guide to git by travis swicegood some rights reserved

Creating a New Branch prompt> git branch <new branch> [<existing>] … example … prompt> git branch new-branch prompt> git branch * master new-branchpragmatic guide to git by travis swicegood some rights reserved

Switchingpragmatic guide to git by travis swicegood some rights reserved

Switching Branches prompt> git checkout new-branch Switched to branch new-branch prompt> git branch master * new-branchpragmatic guide to git by travis swicegood some rights reserved

Create & Switchpragmatic guide to git by travis swicegood some rights reserved

Switching Branches prompt> git checkout -b newest-branch Switched to branch newest-branch prompt> git branch master new-branch * newest-branchpragmatic guide to git by travis swicegood some rights reserved

Mergingpragmatic guide to git by travis swicegood some rights reserved

Merging Branches prompt> git checkout master Switched to branch master prompt> git merge newest-branch Updating 94f1967..a053b49 Fast-forward 0 ﬁles changed, 0 insertions(+), 0 deletions(-) create mode 100644 foopragmatic guide to git by travis swicegood some rights reserved

Fast Forward newest-branch masterpragmatic guide to git by travis swicegood some rights reserved

Merging Branches prompt> git merge new-branch Merge made by recursive. 0 ﬁles changed, 0 insertions(+), 0 deletions(-) create mode 100644 barpragmatic guide to git by travis swicegood some rights reserved

Recursive Merge new-branch masterpragmatic guide to git by travis swicegood some rights reserved

Rebasingpragmatic guide to git by travis swicegood some rights reserved

Rebasing Branches prompt> git checkout new-branch Switched to branch new-branch prompt> git rebase master First, rewinding head to replay your work on top of it... Applying: …pragmatic guide to git by travis swicegood some rights reserved

Before Rebasing new-branch masterpragmatic guide to git by travis swicegood some rights reserved

After Rebasing new-branch masterpragmatic guide to git by travis swicegood some rights reserved

Rebasing Branches prompt> git checkout new-branch Switched to branch new-branch prompt> git rebase master First, rewinding head to replay your work on top of it... Applying: …pragmatic guide to git by travis swicegood some rights reserved

Rebasing Branches prompt> git checkout new-branch Switched to branch new-branch prompt> git rebase 1a3cdc2 First, rewinding head to replay your work on top of it... Applying: …pragmatic guide to git by travis swicegood some rights reserved

Deletingpragmatic guide to git by travis swicegood some rights reserved

Deleting Branches prompt> git branch -d newest-branch Deleted branch newest-branch (was a053b49).pragmatic guide to git by travis swicegood some rights reserved

Not in Current Branch new-branch masterpragmatic guide to git by travis swicegood some rights reserved

Really Deleting Branches prompt> git branch -D new-branch Deleted branch new-branch (was 1a3cdc2).pragmatic guide to git by travis swicegood some rights reserved

Team Workpragmatic guide to git by travis swicegood some rights reserved

Remote Repositorypragmatic guide to git by travis swicegood some rights reserved

Remotespragmatic guide to git by travis swicegood some rights reserved

Viewing Remotes prompt> git remote prompt>pragmatic guide to git by travis swicegood some rights reserved

Viewing Remotes prompt> cd /usr/local prompt> git remote homebrew roder tswicegoodpragmatic guide to git by travis swicegood some rights reserved

Addingpragmatic guide to git by travis swicegood some rights reserved

Adding Remotes prompt> git remote add <remote> <url> … example … prompt> git remote add tswicegood git://github.com/tswicegood/homebrew.git prompt> git remote tswicegoodpragmatic guide to git by travis swicegood some rights reserved

Removingpragmatic guide to git by travis swicegood some rights reserved

Removing Remotes prompt> git remote rm <remote> … example … prompt> git remote rm tswicegoodpragmatic guide to git by travis swicegood some rights reserved

Fetchingpragmatic guide to git by travis swicegood some rights reserved

Fetching Changes prompt> git fetch <remote> … example … prompt> git fetch tswicegood remote: Counting objects: 3, done. … clipped … * [new branch] master -> tswicegood/masterpragmatic guide to git by travis swicegood some rights reserved

Remote Branchespragmatic guide to git by travis swicegood some rights reserved

Remote Branches prompt> git branch -r tswicegood/master … or everything at once … prompt> git branch -a * master remotes/tswicegood/masterpragmatic guide to git by travis swicegood some rights reserved

You Still Have to Mergepragmatic guide to git by travis swicegood some rights reserved

Pullingpragmatic guide to git by travis swicegood some rights reserved

Pulling Changes prompt> git pull <remote> <branch> … example … prompt> git pull tswicegood master … clipped … * branch master -> FETCH_HEAD Fast-forward … clipped …pragmatic guide to git by travis swicegood some rights reserved

Grokking Refspecs prompt> git pull <remote> <branch> … example … prompt> git pull tswicegood master … clipped … * branch master -> FETCH_HEAD Fast-forward … clipped …pragmatic guide to git by travis swicegood some rights reserved

Grokking Pull Refspecs prompt> git pull <remote> <remote branch>:<local branch> … examples … prompt> git pull tswicegood master prompt> git pull tswicegood master:master prompt> git pull tswicegood dev:my-devpragmatic guide to git by travis swicegood some rights reserved

Pulling Part 2pragmatic guide to git by travis swicegood some rights reserved

Pulling Changes prompt> git pull --rebase <remote> <branch> … example … prompt> git pull --rebase tswicegood master … clipped … * branch master -> FETCH_HEAD First, rewinding head to replay your work on top of it... clipped …pragmatic guide to git by travis swicegood some rights reserved

Pushingpragmatic guide to git by travis swicegood some rights reserved

Pushing Changes prompt> git push <remote> <branch> … example … prompt> git push tswicegood master … clipped … * [new branch] new-branch -> new-branchpragmatic guide to git by travis swicegood some rights reserved

Grokking Push Refspecs prompt> git push <remote> <local branch>:<remote branch> … examples … prompt> git push tswicegood master prompt> git push tswicegood master:master prompt> git push tswicegood my-dev:devpragmatic guide to git by travis swicegood some rights reserved

Team Workflowpragmatic guide to git by travis swicegood some rights reserved

Fully Distributed Designer Bob Developer Jane Youpragmatic guide to git by travis swicegood some rights reserved

Shared Model Designer Bob You Developer Janepragmatic guide to git by travis swicegood some rights reserved

Lots Morepragmatic guide to git by travis swicegood some rights reserved

Several Bookspragmatic guide to git by travis swicegood some rights reserved

PragProg.compragmatic guide to git by travis swicegood some rights reserved

git-scm.com #git (freenode)pragmatic guide to git by travis swicegood some rights reserved

Travis Swicegood travisswicegood.com @tswicegood travis@domain51.com http://joind.in/2855pragmatic guide to git by travis swicegood some rights reserved

Pragmatic Guide to Git

by ConFoo

Accessibility

Categories

Upload Details

Usage Rights

Statistics

Pragmatic Guide to Git Presentation Transcript