chillin at the mansion with git forks.sh

# checking out your repo (as the 'origin' remote), then adding the other dude's repo as a remote
[jamie@jproof ~]$ git clone git://github.com/slambert/WPFolio.git wpfolio
[jamie@jproof ~]$ cd wpfolio
[jamie@jproof ~/wpfolio(master)]$ git status
# On branch master
nothing to commit (working directory clean)
[jamie@jproof ~/wpfolio(master)]$ git remote add danielwiener git://github.com/danielwiener/WPFolio.git
[jamie@jproof ~/wpfolio(master)]$ git fetch danielwiener
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From git://github.com/danielwiener/WPFolio
 * [new branch]      dynamic-menu-highlighting -> danielwiener/dynamic-menu-highlighting
 * [new branch]      master     -> danielwiener/master

# setup a local branch that tracks his master (so you can type 'git pull' without saying 'git pull danielwiener master')
[jamie@jproof ~/wpfolio(master)]$ git branch danielwiener --track danielwiener/master
Branch danielwiener set up to track remote branch master from danielwiener by rebasing.
[jamie@jproof ~/wpfolio(master)]$ git checkout danielwiener
Switched to branch 'danielwiener'
[jamie@jproof ~/wpfolio(danielwiener)]$ git log
commit a58c9c9e62fd488e0c321b230b282f9a9b5b42ed
Author: danielwiener <[email protected]>
Date:   Fri Mar 26 14:03:27 2010 -0400

    change css for footer below white content section, with left and right footer and gallery css from WP moved to css file

commit bd54c70b6358efad7494e395f3e9686a3d055b1a

(...a bunch of other commits...)


[jamie@jproof ~/wpfolio(danielwiener)]$ git diff master
(...differences between this branch and master...)

# OK cool I like *all* of his changes, so we'll just merge his whole branch into master & push out
# if we just wanted some of them, we could use the 'git cherrypick' command to just suck in specific commits
[jamie@jproof ~/wpfolio(danielwiener)]$ git checkout master
Switched to branch 'danielwiener'

[jamie@jproof ~/wpfolio(danielwiener)]$ git checkout master
Switched to branch 'master'
[jamie@jproof ~/wpfolio(master)]$ git merge danielwiener
Updating bd54c70..a58c9c9
Fast-forward
 style.css |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 deletions(-)
[jamie@jproof ~/wpfolio(master)]$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
nothing to commit (working directory clean)

(... now push your shit to your repo, "origin"... DONE)