Git Magic: Versioning Files like a Boss

Git Magic:
Versioning Files
Like a Boss
Tommy MacWilliam
tmacwilliam@cs50.net

Today

• setting up like a boss
• basic git like a boss
• using branches like a boss
• reverting changes like a boss
• collaborating like a boss

Git is...
• “Git is distributed version control system
focused on speed, effectivity and real-world
usability on large projects”
• “distributed development”
• “non-linear development”
• “efﬁcient handling of large projects”
• “cryptographic authentication of history”

Installing Git

• Windows: http://code.google.com/p/
msysgit/
• OS X: http://code.google.com/p/git-osx-
installer/
• Appliance: already installed!

Installing Git

root@appliance(~): git
usage: git [--version] [--exec-path[=<path>]] [--html-path]
[-p|--paginate|--no-pager] [--no-replace-objects]
[--bare] [--git-dir=<path>] [--work-tree=<path>]
[-c name=value] [--help]
<command> [<args>]

git conﬁg --global
user.name
“Tommy MacWilliam”

git conﬁg --global
user.email
tmacwilliam@cs50.net

Git Magic: Versioning Files like a Boss

Commits

• snapshots of your project
• what your ﬁles look like at a given point
• single event in project history

Commit Messages

• short message describing what’s different in
this commit
• add any new features?
• ﬁx some bugs?
• break anything?

Commit Messages

• http://www.commitlogsfromlastnight.com/

git commit -a -m
“oh hi, mark!”

5aeebab117b892fa42002146e4c62be676bc4621

b43b0ad1e8108e7ab870d7a54feac93ae8b8600e

461476587780aa9fa5611ea6dc3912c146a91760

Commit 5aeebab117b892fa42002146e4c62be676bc4621
ID

b43b0ad1e8108e7ab870d7a54feac93ae8b8600e

461476587780aa9fa5611ea6dc3912c146a91760

HEAD

git init
git status
git add

git commit
git log
git show

Branches
• non-linear development process
• changes on one branch do not affect
other branches
• crazy idea? make a branch
• didn’t work? delete the branch
• all done? merge the branch

git branch test
git checkout test

5aeeb

b43b0

46147

master

5aeeb
git branch test

b43b0 f862f

46147 36223

master test

5aeeb

b43b0 f862f

46147 36223

git merge
87aed

master test

Merge vs. Rebase

• git merge: new commit, non-linear history
• git rebase: no new commit, linear history

5aeeb

b43b0

git rebase

46147 f862f 36223

master

Conﬂicts

• change in one branch can be incompatible
with another
• git tries to resolve, but sometimes cannot

Conﬂict Resolution
int main(int argc, char** argv) {
printf(“you invited all my friends”);
}

printf(“good thinking!”);
}

Conflict Resolution

<<<<<<< HEAD:file.c
printf(“you invited all my friends”);
=======
printf(“good thinking!”);
>>>>>>> f862f:file.c
}

git checkout
git branch

git merge
git rebase

5aeeb

b43b0

46147

git revert b43b0
42bb4
(b43b0)

File-Speciﬁc Reverts

• git checkout -- index.php
• replace with version in index
• git checkout b43b0 index.php
• replace with version in commit b43b0

git revert
git reset

git checkout
git bisect

git push
git@github.com:cs50/project
master

git remote add origin

git remote add origin
git push origin master

git clone

git init
git add --all
git commit

Alice Bob

git remote add origin url

Alice Bob

git clone url

Alice Bob

git add --all
git commit

Alice Bob


Alice Bob

git pull origin master

Alice Bob

git checkout -b
origin/test

scp ~/.ssh/id_rsa.pub
host:~/.ssh/authorized_keys

git remote add live
user@cloud.cs50.net:~/project

git remote add live
user@cloud.cs50.net:~/project
git push live master

Hooks
• applypatch-msg • post-applypatch

• commit-msg • pre-commit

• post-commit • pre-commit-msg

• post-receive • pre-rebase

• post-update • update

post-receive
#!/bin/sh
GIT_WORK_TREE=/home/tmacwill/public_html
git checkout -f
chmod -R 644 /home/tmacwill/public_html/
*.html
chmod -R 600 /home/tmacwill/public_html/
*.php

git clone
git push

git remote
git pull

More Resources

• http://progit.org/book/
• http://book.git-scm.com/
• http://gitref.org/
• http://git-scm.com/documentation

git commit -a -m
“thanks!”

Git Magic: Versioning Files like a Boss

Recommended

More Related Content

What's hot (20)

Viewers also liked (8)

Similar to Git Magic: Versioning Files like a Boss (20)

Recently uploaded (20)

Git Magic: Versioning Files like a Boss

Editor's Notes