31 Oct '13, 12am

I always go back to this post as reference for Keeping a Github Fork Updated.

Keeping A GitHub Fork Updated Dan Croak May 02, 2011 git unix I forked a GitHub repo thoughtbot/dotfiles to croaky/dotfiles and want to keep it updated. Track After I forked the repo to your Github account, I did this one time: git clone [email protected]:croaky/dotfiles.git cd dotfiles git remote add upstream [email protected]:thoughtbot/dotfiles.git Update Each time I want to update, from my local master branch: git fetch upstream git rebase upstream/master The goal of the rebase is to have a cleaner history if I have local changes or commits on the repo. It's the difference between the the left and the right in the image below. Commit rights upstream? If I also have commit rights to the upstream repo, I can create a local upstream branch and do work that will go upstream there. git checkout -b upstream upstream/master

Full article: http://robots.thoughtbot.com/keeping-a-github-fork-updated

Tweets

There will be diversions in place for some bus ...

merseytravel.gov.uk 30 Oct '13, 12pm

Rail service information - For up-to-date information on rail travel across Merseyside and beyond, visit www.merseyrail.or...

New post: Heatkit Clock Updated with a PIC32 and GPS

New post: Heatkit Clock Updated with a PIC32 an...

hackaday.com 01 Nov '13, 11pm

One of [Bob's] most treasured possessions is a Heathkit alarm clock he put together as a kid. Over the years he’s noticed ...