search

senny / cabbage

get the maximum out of emacs
http://senny.github.com/cabbage/
156 stars 21 forks source link

Spelling fixes on index page #138

Closed lukasgraf closed 12 years ago

senny commented 12 years ago

@lukasgraf I've already fixed one mistake. Can you rebase your pull-request against the current state of master?

lukasgraf commented 12 years ago

@senny Done (I think :))

lukasgraf commented 12 years ago

This is what I did:

# Check out my fork
git clone https://github.com/lukasgraf/cabbage.git cabbage-lg
cd cabbage-lg
# Switch to origin/gh-pages and set up tracking branch
git co gh-pages
# Add the repo I forked from as a remote
git remote add upstream https://github.com/senny/cabbage.git
# Fetch changes from upstream
git fetch upstream
# Rebase my origin/gh-pages onto upstream/gh-pages
git rebase upstream/gh-pages
# Resolve conflicts
e index.html
git add index.html
git rebase --continue
# Force push needed since I rebased after already having pushed commits
git push --force  origin gh-pages

I was a bit confused because git wouldn't let me push to github after rebasing, but after thinking about it it makes sense, since I rewrote history when rebasing and therefore need to do a force push -- correct?

senny commented 12 years ago

@lukasgraf yes this looks perfect! You can always check the "diff" tab in the pull-request to make sure everything lines up.