Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make this a branch on the wd42-site repo #3

Open
mx-moth opened this issue Sep 26, 2013 · 3 comments
Open

Make this a branch on the wd42-site repo #3

mx-moth opened this issue Sep 26, 2013 · 3 comments
Assignees

Comments

@mx-moth
Copy link

mx-moth commented Sep 26, 2013

Instead of a separate repository, this could be a branch of the wd42 repository. If an orphaned branch is used, the two histories will be completely separate and unrelated, but then all the code is in one location:

$ cd wd42-site

$ git remote add wd42-deployment https://github.com/wd42/wd42-deployment.git

$ git fetch wd42-deployment
warning: no common commits
remote: Counting objects: 45, done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 45 (delta 18), reused 33 (delta 6)
Unpacking objects: 100% (45/45), done.
From https://github.com/wd42/wd42-deployment
 * [new branch]      master     -> wd42-deployment/master

$ git checkout -b deployment wd42-deployment
Branch deployment set up to track remote branch master from wd42-deployment.
Switched to a new branch 'deployment'

$ sed -i 's#wd42/wd42-deployment/master#wd42/wd42-site/deployment#' bootstrap.sh README.md

$ git add bootstrap.sh README.md

$ git commit -m 'Changed the location of the deployment scripts'
[deployment 3626b68] Changed the location of the deployment scripts
 2 files changed, 3 insertions(+), 3 deletions(-)

$ git push origin -u deployment

Having everything in the one repository makes it all contained and easy to ship around.

@mx-moth
Copy link
Author

mx-moth commented Sep 26, 2013

I would make a pull request on the wd42-site repository, but github does not allow pull requests to be made for unrelated commit histories. Booo. I have a fork with the deployment branch in it, which just does these modifications.

@joshgillies
Copy link
Member

Oh nice trick! 👍

Will look at either pulling or performing the above in the coming days, cheers!

@ghost ghost assigned joshgillies Sep 26, 2013
@jonnyscholes
Copy link

Oh that is cool. Cheers :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants