Loading presentation...
Prezi is an interactive zooming presentation

Present Remotely

Send the link below via email or IM

Copy

Present to your audience

Start remote presentation

  • Invited audience members will follow you as you navigate and present
  • People invited to a presentation do not need a Prezi account
  • This link expires 10 minutes after you close the presentation
  • A maximum of 30 users can follow your presentation
  • Learn more about this feature in our knowledge base article

Do you really want to delete this prezi?

Neither you, nor the coeditors you shared it with will be able to recover it again.

DeleteCancel

Make your likes visible on Facebook?

Connect your Facebook account to Prezi and let your likes appear on your timeline.
You can change this under Settings & Account at any time.

No, thanks

Git Happens

as presented at PyCon Canada, Aug 2013
by

Jessica Kerr

on 10 August 2013

Comments (0)

Please log in to add your comment.

Report abuse

Transcript of Git Happens

Git Happens
commit 3f6aed06133a7b292b839c30db029257f2358e01
Author: Jessica Kerr <@jessitron>
Date: Sat Aug 10 11:45:38 2013 -0500
concepts | +++
vocabulary | +++++
why | +++
what-to-type | --
github | -
Git is Hard
Distributed VCS
DAG
Directed
Acyclic
Graph
SHA-1 hash
7c50d0aabcfd6b62a36ba67fc937c45c6f9c1694
Tree
a64f03
Main.java
df678a
Staging Area
add
commit
checkout
reset
commit
Author & author date
Committer & commit date
tree
message
parent
pointers
master
pycon
HEAD
branchypoo
HEAD
branch
branchypoo
HEAD
master
HEAD
fast-forward merge
branchypoo
concurrent changes
master
HEAD
merge commit
master
HEAD
origin
clone
bare
origin
bare
clone
upstream
remote
remote
master
HEAD
master
origin/master
fetch
master
fetch
origin/master
merge conflicts
push
push
merge conflicts
upstream
master
master
origin/master
feature branches
rebase
bug fix
feature branches
rebase
branch
Author & author date
Message
Committer & commit date
Tree
Parent
more fun
cherry-pick
cherry-pick
squash
more fun & squash
squashme
insanity
rebase -i
tools
tell your story
SourceTree
git-flow
gitk
tower
IntelliJ
GitHub
Git Happens
commit 3f6aed06133a7b292b839c30db029257f2358e01
Author: Jessica Kerr <@jessitron>
Date: Sat Aug 10 11:45:38 2013 -0500
jessitron.github.io/git-happens
Full transcript