Skip to content

Instantly share code, notes, and snippets.

@fishnix

fishnix/gist:2151650

Created March 21, 2012 19:22
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save fishnix/2151650 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save fishnix/2151650 to your computer and use it in GitHub Desktop.
Download ZIP
merge s9y
Raw
gistfile1.txt
git clone git@github.com:fishnix/Serendipity.git -b 1.6
cd Serendipity
git checkout -b upstream/1.6
git remote add upstream https://github.com/s9y/Serendipity.git
git pull upstream 1.6
git checkout 1.6
git merge upstream/1.6
git push
git clone git@github.com:fishnix/Serendipity.git
cd Serendipity
git checkout -b upstream/master
git remote add upstream https://github.com/s9y/Serendipity.git
git pull upstream master
git checkout master
git merge upstream/master
git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment