Skip to content

Instantly share code, notes, and snippets.

@mortenson
Created May 9, 2015 17:59
Show Gist options
  • Save mortenson/9b15098b26610afac929 to your computer and use it in GitHub Desktop.
Save mortenson/9b15098b26610afac929 to your computer and use it in GitHub Desktop.
Drupal subtree site1 PR
$ ### Checkout and push a new branch
$ git checkout -b site1-update
Switched to a new branch 'site1-update'
$ git push -u origin site1-update
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:mortenson/drupal-multisite-subtree.git
* [new branch] site1-update -> site1-update
Branch site1-update set up to track remote branch site1-update from origin.
$ ### Update the site1 subtree
$ git subtree pull --prefix sites/site1 git@github.com:mortenson/site1.git master
remote: Counting objects: 13, done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 13 (delta 0), reused 13 (delta 0), pack-reused 0
Unpacking objects: 100% (13/13), done.
From github.com:mortenson/site1
* branch master -> FETCH_HEAD
Merge made by the 'recursive' strategy.
sites/site1/modules/custom/example_custom/example_custom.info | 3 +++
sites/site1/modules/custom/example_custom/example_custom.modules | 1 +
sites/site1/site1.make | 7 +++++++
3 files changed, 11 insertions(+)
create mode 100644 sites/site1/modules/custom/example_custom/example_custom.info
create mode 100644 sites/site1/modules/custom/example_custom/example_custom.modules
create mode 100644 sites/site1/site1.make
### Push it baby!
$ git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment