Skip to content

Instantly share code, notes, and snippets.

@cpfarher

cpfarher/gist:2e2c88a410e7013452d947084494d0d4

Created June 22, 2018 19:22
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save cpfarher/2e2c88a410e7013452d947084494d0d4 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save cpfarher/2e2c88a410e7013452d947084494d0d4 to your computer and use it in GitHub Desktop.
Download ZIP
merge upstream into my master local branch
Raw
gistfile1.txt
# kudos to https://github.com/drewlesueur
# stolen from here: https://github.com/blog/266-fast-forward-your-fork#comment-11535
git checkout -b upstream-master
git remote add upstream git://github.com/documentcloud/underscore.git
git pull upstream master
git checkout master // [my master branch]
git merge upstream-master
git push origin master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment