configs/scatterd-dotfiles
1
0
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Better instructions for keeping a fork updated.

Browse source
This commit is contained in:
Dan Croak 2011-05-02 08:33:53 -07:00
parent ead8c516ed
commit 57949f53f9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -25,16 +25,16 @@ Track thoughtbot/dotfiles
One time:
git remote add thoughtbot git@github.com:thoughtbot/dotfiles.git
git fetch thoughtbot
git checkout -b thoughtbot thoughtbot/master
git remote add upstream git@github.com:thoughtbot/dotfiles.git
git fetch upstream
git checkout -b upstream upstream/master
Update
------
Each time you want to update:
git checkout thoughtbot
git pull --rebase
git checkout upstream
git pull
git checkout master
git merge thoughtbot
git rebase upstream