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

How i can update? #43

Closed
ctriantaf opened this issue Feb 14, 2012 · 6 comments
Closed

How i can update? #43

ctriantaf opened this issue Feb 14, 2012 · 6 comments
Labels

Comments

@ctriantaf
Copy link

Hello,

how can i update the repo in my pc?
i see that you have update several things (twitter 2.0) and want to update my repo with your changes...
i have to use git pull?
how can i update?

@Heliosmaster
Copy link

I guess that if you followed the procedure listed on the website, in particular the line
git remote set-url origin git@github.com:USERNAME/USERNAME.github.com.git

Your local repo does not point anymore to JB, but to your blog. Therefore, a git pull is of no-use, since it will try and pull from the GH repository of your blog, not from JB..

I am also here to request the functionality of upgrading. I am too "stuck" with version 0.1.0 and would like a quick command to fix everything.

@ctriantaf
Copy link
Author

thats what i thought and i open this issue to solve this problem ;)

@vattay
Copy link
Contributor

vattay commented Feb 21, 2012

While the bootstrap doesn't really support upgrading, git provides a way. I believe this is how I set up my site, but I can't remember every command exactly, so I can't guarantee this is correct.

First, you will want to make a branch of your blog repository that contains your actual site.

Make sure you are on the master of your current blog repo.

Run git checkout -b myblog

That makes a branch for just your stuff. You will have to set your repositories default branch to this new branch in the admin settings in github.

Run git checkout master

Then clean up the master branch and bring it back in sync with the bootstrap master branch by resetting it. You will have to find out the commit id of the last commit jade did by running

git log

git reset --hard <last_commit_id>

Assuming you have an origin branch pointing to your github blog, you must now create and upstream that points to the original bootstrap.

git remote add upstream git://github.com/plusjade/jekyll-bootstrap.git

Then point your local master branch to the remote master.

git branch --set-upstream upstream/master master

At this point you should be able to:

git fetch upstream

and

git merge upstream/master to get your master branch in synch with the bootstrap.

Finally, you can then merge your local master into your blog branch to update your site.

git checkout myblog

git merge master

@blankyao
Copy link

I hava the same problem.

@ctriantaf
Copy link
Author

can someone make i way (script or something) to update?

@marshallshen
Copy link
Collaborator

@clepto @blankyao , I am closing out this long-standing issue.
But please let me know if you have any more questions!

Thanks

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

No branches or pull requests

5 participants