Skip to content

Instantly share code, notes, and snippets.

@jsamuel1

jsamuel1/merge upstream git into subfolder

Created May 29, 2019 05:37
Show Gist options
  • Save jsamuel1/342989fab99088af1e094cfabd62e25c to your computer and use it in GitHub Desktop.
Save jsamuel1/342989fab99088af1e094cfabd62e25c to your computer and use it in GitHub Desktop.
Download ZIP
Raw
merge upstream git into subfolder
git checkout -b upstream
git remote add upstream [email protected]/upstream1/blah.git
git fetch upstream # or use -f in git remote add
git merge -s subtree upstream/master --allow-unrelated-histories -X theirs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment