Permalink
Browse files

Better instructions for keeping a fork updated.

  • Loading branch information...
1 parent ead8c51 commit 57949f53f9e91824da35a8fa27a2710872ac2332 @croaky croaky committed May 2, 2011
Showing with 6 additions and 6 deletions.
  1. +6 −6 README.md
View
12 README.md
@@ -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

0 comments on commit 57949f5

Please sign in to comment.