Sign in or Join FriendFeed
FriendFeed is the easiest way to share online. Learn more »
a solid few hours hanging at @inmanperk, hacking on #albacore, sharpening my #git chops, and jammin' to Interpol, Okkervil River, etc.
wait, so #VMware #Fusion 3 can do a physical-to-virtual machine conversion via a network connection? hawt!
@kbaley umm... to pimp that blog, duh!
@ScottMuc Handbrake looks perfect for backing up to HDD/iPod/iPhone - be nice if it also worked for backup-to-another-DVD. :)
Git's guts: Branches, HEAD, and fast-forwards - James Gregory's Blog - http://www.lostechies.com/blogs...
Git guts: Merging and rebasing - James Gregory's Blog - http://www.lostechies.com/blogs...
lazy web: I need to _backup_ a few DVD's... are there any tools for OS X that make this dead simple?
in search of: caffeine, Internets, and food. thinking: Solstice café for an iced espresso, free wifi, and BLFGT sammich!
last minute C.O.V. - ended up at Innman Perk. The Hummster sandwich was just too much to pass up!
Happy Thanksgiving, all ya'all! And to my non-American homies, enjoy some turkey anyhow! gobble, gobble!
@aaronjensen thanks for getting me out of the #git pickle!
git merge vs git rebase: avoiding rebase hell (with pictures!) http://jarrodspillers.com/article... #git
@haacked son-of-a...
anyone out there have a few minutes to help me w/a #git issue: updating my fork from the upstream master. #need_help
@haacked i know you don't have a soul, but that's b/c you sold it to me for that list bite of kimchi that one time in Vegas...
git merge vs git rebase: avoiding rebase hell (with pictures!) - http://jarrodspillers.com/article...
@bellware perhaps defaulting the thing to "b" and then: my_thing = "a" if <cond>
@catschwamm lucky for you, @laribee _is_ the weird one!
@subdigital if they were still around to disagree. but they're not. the human collective has progressed and photo tech is no longer magic.
"Photographing someone does not cause their soul to be stolen. Similarly, cloning the master repository does not diminish its importance."
@JRGarcia what does your .gitconfig for p4merge look like (post on gist)? I'm thinking I just have it configured wrong.
@davidmohara as you might have guessed the answer is, "it depends." I've settled on git pull from upstream repo into branch on my fork...
@davidmohara ... then git rebase that branch onto my fork's master (which will have had my topic branches merged in). does that track? #git
what merge/diff tool do you use w/ #Git (msysgit) on Windows? having trouble w/Beyond Compare & p4merge. what about on OS X?
@ehexter time to move to GitHub, homie!
Win a new Macbook Pro on Cyber Monday 2009. Details here: http://www.cybermonday.fm/giveawa...
if I could speak the language of rabbits, they would be amazed and I would be their king.
headed to the pitch and looking for goal #2 of the session. (this is the second game of the session, for those counting.)
Pro Git - Git Branching and Rebasing - http://progit.org/book...
now I need to get the recent changes from upstream remote into my forked remote. $> git fetch upstream master $> git rebase upstream/master
Other ways to read this feed:Feed readerFacebook