Skip to content

Instantly share code, notes, and snippets.

@aubricus

aubricus/subtree.md

Last active December 24, 2015 12:29
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save aubricus/6798439 to your computer and use it in GitHub Desktop.
Save aubricus/6798439 to your computer and use it in GitHub Desktop.
Download ZIP
Subtree commands.
Raw
subtree.md

Fetch the Code:

Vendor (run 1st):

git subtree add --prefix src/bigview/static/js/vendor git@github.com:blitzagency/agency-ui-deps.git master --squash

AUF (run 2nd):

git subtree add --prefix src/bigview/static/js/vendor/auf git@github.com:blitzagency/agency-ui-foundation.git master --squash

Update the Code if Needed:

Vendor

git subtree pull --prefix src/bigview/static/js/vendor git@github.com:blitzagency/agency-ui-deps.git master --squash

AUF

git subtree pull --prefix src/bigview/static/js/vendor/auf git@github.com:blitzagency/agency-ui-foundation.git master --squash

Merge changes into Master

git co develop
git subtree split --prefix agency-ui-foundation/ -b release
git co master
git merge -s subtree --no-commit --squash release
git status
git ca "updates"
git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment