johan herland €¦ · the git parable git - simple & powerful git init git add … git commit...

The Git Parable

Johan Herland

<[email protected]>

The Git Parable

● Shamelessly stolen from Tom Preston-Wernerhttp://tom.preston-werner.com/2009/05/19/the-git-parable.html

● I'm lazy...● Also: Best introduction to Git I've found so far

http://tom.preston-werner.com/2009/05/19/the-git-parable.html

The Git Parable

● Git - simple & powerful

The Git Parable


git initgit add …git commit …git branch …git checkout …git tag …git diff …git log …git remote …git fetch …git pull …git push …...

The Git Parable


git initgit add …git commit …git branch …git checkout …git tag …git diff …git log …git remote …git fetch …git pull …git push …...

TADAA!!!

The Git Parable


Let's tell a parable

The Git Parable


The Git Parable


Eureka!

The Parable

● A simple computer

– A text editor– A few filesystem commands

The Parable

● Write a large software program

The Parable

● Write a large software program● Invent some method to keep track of versions

– retrieve code that you changed/deleted

Responsible!

Snapshots

● Alfred, the photographer

Alfred

Snapshots

● Alfred, the photographer● Hazel and her daughter

Hazel

daughter

Snapshots


– Remember what thedaughter was like ateach different stage

Snapshots


– Remember what thedaughter was like ateach different stage

Eureka!

Snapshots

working

Snapshots

working working.copy

Snapshots

working snapshot-0working.copy

Snapshots

working snapshot-0 snapshot-1

Snapshots


message message

2009-05-20 12:34:56

Initial version

2009-05-21 23:45:01

Introduced a new foo,and reset the bar toxyzzy.

Branches


. . .

snapshot-99

Branches


. . .

snapshot-99

w00t! cool!

nice!

Branches


. . .

snapshot-99

. . .snapshot-109

Branches


. . .

snapshot-99

Does not work!

Boo!

. . .snapshot-109

Branches


. . .

snapshot-99

. . .snapshot-109

Branches


. . .

snapshot-99

. . .snapshot-109

?snapshot-110

?

Branches

Branches

Eureka!

Branches

Branches

snapshot-0snapshot-1

message

2009-05-21 23:45:01parent: snapshot-0


Branch Names

working

snapshot-0

snapshot-1

snapshot-99

snapshot-109

snapshot-110

snapshot-X

Branch Names

working

snapshot-0

snapshot-1

snapshot-99

snapshot-109

snapshot-110

snapshot-X

snapshot-X

snapshot-X

snapshot-X

working

snapshot-0

snapshot-1

snapshot-99

snapshot-109

snapshot-110

snapshot-X

snapshot-X

snapshot-X

Branch Names

?

working

snapshot-0

snapshot-1

snapshot-99

snapshot-109

snapshot-110

Branch Names

This will be the“Version 1.0 Maintenance” Branch

This is the“master” branch

working

snapshot-0

snapshot-1

snapshot-99

snapshot-109

snapshot-110

Branch Names

This is the“Version 1.0 Maintenance” Branch.

It contains:snapshot-110

(and its ancestors)

This is the“master” branch.

It contains:snapshot-109

(and its ancestors)

working

snapshot-0

snapshot-1

snapshot-99

snapshot-109

snapshot-110

Branch Names

branches

master: snapshot-109v1.0-maint: snapshot-110

working

snapshot-0

snapshot-1

snapshot-99

snapshot-109

snapshot-110

Branch Names

branches


snapshot-111

working

snapshot-0

snapshot-1

snapshot-99

snapshot-109

snapshot-110

Tags

branches


snapshot-111

tags

v1.0: snapshot-99v1.0.1: snapshot-110

working

Distributed

branches

tags Sigh...

working

Distributed

branches

tags Hi Zoe!Zoe

working

Distributed

branches

tags

branches

tags

working

working

Distributed

branches

tags

branches

tags

working

Bye!

working

Distributed

branches

tags

branches

tags

working

snapshot-114

snapshot-115

snapshot-114

snapshot-115

Distributed

2009-05-21 23:45:01parent: snapshot-113author: Zoe <[email protected]>


snapshot-114

message

snapshot-114

message

2009-05-22 12:12:12parent: snapshot-113author: Me <[email protected]>

Blarfle, a cool newfeature; extends theexisting blorg.

Distributed

message

SHA1

8ba3441b6b89cad23387ee875f2ae55069291f4b

2009-05-22 12:12:12parent: snapshot-113author: Me <[email protected]>

Blarfle, a cool newfeature; extends theexisting blorg.

2009-05-21 23:45:01parent: snapshot-113author: Zoe <[email protected]>


message

SHA1

db9ecb5b5a6294a8733503ab57577db96ff2249e

working

Distributed

branches

tags

branches

tags

working

8ba3441…

083dbcf…

db9ecb5…

575db4b…

working

Distributed

branches

tags

branches

tags

working

8ba3441…

083dbcf…

db9ecb5…

575db4b…

?

working

Distributed

branches

tags

branches

tags

working

8ba3441…

083dbcf…

db9ecb5…

575db4b…

db9ecb5…

575db4b…

working

Offline

branches

tags

branches

tags

working

w00t!

working

Offline

branches

tags

branches

tags

working

branches

tags

workingworking

branches

tags

(simpler drawings)

(simpler drawings)

master

v1.0.1

v1.0

v1.0-maint

v1.0

v1.0.1

v1.0-maint

master

math math

(simpler drawings)

master

v1.0

v1.0-maint

v1.0.1

master

v1.0

v1.0-maint

v1.0.1

math math

Merges

master

v1.0

v1.0-maint

v1.0.1

master

v1.0

v1.0-maint

v1.0.1

math

math

Merges

master

v1.0

v1.0-maint

v1.0.1

master

v1.0

v1.0-maint

v1.0.1

math

math

?

Merges

master

v1.0

v1.0-maint

v1.0.1

master

v1.0

v1.0-maint

v1.0.1

math

math

Merges

master

v1.0

v1.0-maint

v1.0.1

master

v1.0

v1.0-maint

v1.0.1

math math

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

Hic!

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

drunk

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

drunk

drunk^

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

drunk

drunk^

drunk^^

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

drunk

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

drunk

working

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

drunk

working

drunk^^^

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

drunk

working

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

drunkdrunk

Rewriting History

master

v1.0

v1.0-maint

v1.0.1

math

drunk

Staging Area

master

v1.0

v1.0-maint

v1.0.1

math

drunk

working

Oops...

Staging Area

master

v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

Staging Area

v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

README

master

Diffs

v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

What are the changes?- working vs. staging- working vs. snapshot X- staging vs. snapshot X- snapshot X vs. snapshot Y

master

Diffs

v1.0

v1.0-maint

v1.0.1

math

drunk

working staging

master

Diff algorithm

--- staging+++ working

foo-baz+bazzle xyzzy

Diffs

v1.0

v1.0-maint

v1.0.1

math

drunk

working staging

master

--- 90b69eb...+++ staging

foo-bar+baz xyzzy

Diffs

v1.0

v1.0-maint

v1.0.1

math

drunk

working staging

master

--- 1573d45...+++ 90b69eb...

foo bar+xyzzy

Diffs

v1.0

v1.0-maint

v1.0.1

math

drunk

working staging

master

--- 90b69eb...+++ 5fa5d28...

foo bar-xyzzy+lorem ipsum dolor+sit amet, ...

Eliminating Duplication

v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

v1.0

v1.0-maint

v1.0.1

math

working

staging

master


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

Eureka!

SHA1

2804133755c3ed396d162028c7b30a1cbcfecded

objects


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objectsc3c769c(aka snapshot-0)

subdir1 subdir2

subsubdir1

file3 file2 file1

Temp file

file4


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

SHA1

objects

Temp file

a8458149fd2f6d1573d45707607d0befb8decb30

c3c769c(aka snapshot-0)

subdir1 subdir2

subsubdir1

file3 file2 file1

file4


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

blob a8458149fd2f6d1573d45707607d0befb8decb30 file1

Temp file



subdir1 subdir2

subsubdir1

file3 file2 file1

file4


subdir1 subdir2

subsubdir1

file3 file2 file1

file4


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

blob a8458149fd2f6d1573d45707607d0befb8decb30 file1

Temp file



subdir1 subdir2

subsubdir1

file3 file2

file4


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

blob a8458149fd2f6d1573d45707607d0befb8decb30 file1blob ef1f8810341ab1e9948d5e49d2a03e1ce586b1a0 file2

ef1f8810341ab1e9948d5e49d2a03e1ce586b1a0

SHA1


subdir1 subdir2

subsubdir1

file3

file4


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

blob a8458149fd2f6d1573d45707607d0befb8decb30 file1blob ef1f8810341ab1e9948d5e49d2a03e1ce586b1a0 file2blob 376256ffd8737954c129dfc2f6f7cffc559b78b7 file3

376256ffd8737954c129dfc2f6f7cffc559b78b7

SHA1


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

blob a8458149fd2f6d1573d45707607d0befb8decb30 file1blob ef1f8810341ab1e9948d5e49d2a03e1ce586b1a0 file2blob 376256ffd8737954c129dfc2f6f7cffc559b78b7 file3

8aa73a2b1cf458c7c88dc16202ae794f5c99ef10

SHA1


subdir1 subdir2

subsubdir1file4


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

tree 8aa73a2b1cf458c7c88dc16202ae794f5c99ef10 subsubdir1

8aa73a2b1cf458c7c88dc16202ae794f5c99ef10

New temp file


subdir1 subdir2

subsubdir1file4


subdir1 subdir2

file4


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

tree 8aa73a2b1cf458c7c88dc16202ae794f5c99ef10 subsubdir1blob be17eaddd5e696239e8a5f6e6e3dbce524707983 file4

be17eaddd5e696239e8a5f6e6e3dbce524707983

New temp file

SHA1


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

67a3c2a9119a3c3c769c0b1e8735fa5d28d94a12

SHA1

tree 8aa73a2b1cf458c7c88dc16202ae794f5c99ef10 subsubdir1blob be17eaddd5e696239e8a5f6e6e3dbce524707983 file4


subdir1 subdir2


subdir1 subdir2


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

8ff0b253a4f3744576427c7dd575db4bfdb8259d

SHA1

tree 2804133755c3ed396d162028c7b30a1cbcfecded subdir1tree 67a3c2a9119a3c3c769c0b1e8735fa5d28d94a12 subdir2

New temp file


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master


8ff0b253a4f3744576427c7dd575db4bfdb8259d


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master


8ff0b253a4f3744576427c7dd575db4bfdb8259dmessage

tree: 8ff0b253a4f3744576427c7dd575db4bfdb8259ddate: 2009-05-22 12:12:12author: Me <[email protected]>

Initial version


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master


5a2fa987819083dbcf44d36697b7ecbe3bfc9a3f

tree: 8ff0b253a4f3744576427c7dd575db4bfdb8259ddate: 2009-05-22 12:12:12author: Me <[email protected]>

Initial version

SHA1


v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

Compressing Blobs

v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

ZLIB

The True Git

v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

● TADAA!● This is pretty much Git● Nicer command line tools

for all these operations● Many, many other tools

Commands: Getting Started

● First, tell Git who you are:– git config --global user.name “My Name”

– git config --global user.email “[email protected]”

● Get help:

– git <command> -h– git help <command>

● Start a new Git repository:

– git init

mailto:[email protected]

Commands: Making snapshots

working staging

staging snapshot

git commit -a}

snapshot snapshot

...

● git add

● git commit

● git log

● git statusworking staging

?/

gitk

Commands: Diffing

working staging

staging snapshot

snapshot

snapshot snapshot

vs.

● git diff

● git diff --staged

● git diff HEAD

● git diff <from> <to>

vs.

vs.

working

vs.

Commands: Branches & Tags

● git branch

● git branch <branch>

● git checkout <branch>

● git tag -l

● git tag <tag>

git checkout -b ...}

Commands: Fetching & Merging

● git remote add <name> <URL>

● git fetch <name>

● git merge <name>/<branch>

git pull}

Conclusion

v1.0

v1.0-maint

v1.0.1

math

drunk

working

staging

master

objects

● Keep this parable in mind● Git is simple and powerful

● One more thing:

git reflog

Where to go next?

● Git homepage: http://git-scm.com● Pro Git: http://git-scm.com/book● Git Reference: http://gitref.org● GitHub: http://github.com● Gitorious: http://gitorious.org

http://git-scm.com/

http://git-scm.com/book

http://gitref.org/

http://github.com/

http://gitorious.org/

Questions?

● Thanks for your attention!

● These slides are available at:https://github.com/jherland/git_parable

● Reach me at <[email protected]>

https://github.com/jherland/git_parable

mailto:[email protected]

johan herland €¦ · the git parable git - simple & powerful git init git add … git commit...

Documents

2013 GIT Sinhala @ apepanthiya GIT Sinhala... · 2013 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

Migrating to Git: Let's Git this party started · Git: •git fast-import CVS content into temporary Git repository •Git-move-refs •git prune, repack, gc and repack •Validate

PetaLinux Tools Documentation - Xilinx · git git 1.8.3 git 1.7.1 git 1.7.1 git 1.8.3 git 1.8.3 git 1.7.1 or above ... If yo u wish to keep the license for your records, ... • Clean

Fractured Feminism: Racism, Classism, and Sexism in Herland

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

Photography by Mamta B. Herland

Git LFS - acailly.github.io · $ git config --list [...] filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true

do~HERLAND ~ ICE - UCO Librarylibrary.uco.edu/archives/digital_collections/herland/pdf/Herland... · guitar. Her latest recording ... and Dan Quayle -and quail at the thought! Is

Git & e git beginner workshop

2012 GIT English - Ape Panthiya GIT English... · 2012 GIT English @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

2013 GIT Marking Scheme English @ apepanthiyaapepanthiya.lk/resources/git/papers/2013 GIT... · 2013 GIT Marking Scheme English @ apepanthiya.lk Subject: G.C.E A/L GIT Marking Schemes

GIT BASICS FOR EVERYONE...Git installation Macbook: If Xcode exists, probably you already have git. Check with `git —version` `brew install git` Windows: Download windows git installer

Git in pills : git stash

Git avanzado - Mario González, formador y desarrollador web · 2019-10-01 · git fetch + git rebase = git pull --rebase Subir tags: git push --tags Git avanzado. Repositorios remotos

PowerPoint Presentation€¦ · $ git init $ git add $ git status $ git commit $ git push $ git pull $ git clone • • • • • • • • $ sudo apt-get install

Git J Club Dm Git

Presen Herland

Febru 2000 CD - UCO Librarylibrary.uco.edu/archives/digital_collections/herland/pdf/Herland...Febru 2000 CHECK THESE OuT By Deb Willis Don't let the corporate bookstores be your only

Manual Git y Git Hub

Mixed media art- Mamta B. Herland

Conjugated Polymers, Amyloid Detection and Assembly of ...liu.diva-portal.org/smash/get/diva2:23998/FULLTEXT01.pdf · Anna Herland, K Peter R Nilsson, Johan D M Olsson, Per Hammarström,

herland newsletter - UCO Librarylibrary.uco.edu/archives/digital_collections/herland/pdf/Herland... · herland newsletter ... 13 . Kay Gardner, 11 Moonc ire l es 11 14 . Margie Adam

new repository – clone · Initialized empty Git repository abaj ric@nb01 — Terminal git-demo . git in /home/abaj ric/git-demo.git/ Terminal abajric@nb01 -/git-demo-local S git

Git Down, Git On Up: Practical Examples of Intermediate Git Techniques

Smacking Git Around - Advanced Git Tricks

ALaboratoryIntroductionto git and GitHubnewton.cx/~peter/files/git-lab-handout.pdf · git status, git checkout 7 Topic 3: git status, git checkout Fundamentally, Now,insomecircumstancesHEAD

Herland Pride Picnic is Coming Home - UCO Librarylibrary.uco.edu/archives/digital_collections/herland/pdf/Herland... · Herland Pride Picnic is Coming Home Our Annual Pride Picnic,

Digital Art by Mamta B. Herland

Git and git flow

Git - Single Repository - Drexel Universitykschmidt/CS265/Lectures/Git/git-single.pdfGit - Single Repository Kurt Schmidt Intro First Repository git init git add ... The Actual Repository

Git & Git Workflows

Git Tricks — git utilities that make life git easier

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdf2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers,

Gilman Herland

Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,