Skip to content

Instantly share code, notes, and snippets.

@mattetti
Created December 9, 2008 00:37
Show Gist options
  • Save mattetti/33702 to your computer and use it in GitHub Desktop.
Save mattetti/33702 to your computer and use it in GitHub Desktop.
1. fork mattetti/merb-book
2. pull your clone
$ clone git clone git@github.com:yourname/merb-book.git
3. git checkout -b lang origin/lang # local active branch
4. git remote add core git@github.com:mattetti/merb-book.git # remote track mattetti
5. git fetch mattetti # retrieve mattetti branches
6. git pull mattetti lang
6. update your lang branch
git checkout master
git pull mattetti master
git checkout lang
git rebase master
git rebase -i master
gco master
git merge lang
git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment