I forked a GitHub repo
croaky/dotfiles and want to
keep it updated.
After I forked the repo to your Github account, I did this one time:
git clone firstname.lastname@example.org:croaky/dotfiles.git cd dotfiles git remote add upstream email@example.com:thoughtbot/dotfiles.git
Each time I want to update, from my local
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.
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