So, here’s a bookmark-as-a-reminder to future me. I was contributing to a little application called Curtail (nee ImCompressor) and in the time between forking the original project and submitting my pull request, the entire project had changed names, icons and the whole she-bang. I wasn’t sure if you could rebase a fork off of upstream on Github, but it turns out you can fairly easily through the commandline (I couldn’t find a way to do the same through the website).

In short, fire up a terminal, then:

1.) Set a new remote as, say, upstream

git remote add upstream https://github.com/USERNAME/PROJECT

2.) Fetch any upstream changes

git fetch upstream

3.) Merge upstream changes with your current branch

git merge upstream/BRANCH

4.) Profit?