Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'thoughtbot/master'

  • Loading branch information...
commit 437f9a19ed78e8e39786980eedfc92d38278506b 2 parents 36af622 + 57949f5
@nickrivadeneira nickrivadeneira authored
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
Please sign in to comment.
Something went wrong with that request. Please try again.