search

evilstreak / markdown-js

A Markdown parser for javascript
7.69k stars 863 forks source link

Update README.md #189

Closed samelawrence closed 10 years ago

samelawrence commented 10 years ago

-- Nitpicky grammar fixes, this time without one-lining paragraphs.

samelawrence commented 10 years ago

@evilstreak Fixed back that issue you found. Should be ready to go now.

evilstreak commented 10 years ago

Sorry to be picky, however, could you squash those two commits together? Happy to merge once you've done so.

samelawrence commented 10 years ago

@evilstreak No worries. This is all good learning for me. I actually don't know how to squash two commits together. Any help would be appreciated.

evilstreak commented 10 years ago

I generally use an interactive rebase: git rebase -i HEAD~2

That will bring up your $EDITOR with one line for each of the previous two commits (HEAD~2 points to two commits before HEAD) with some instructions inline.

Change the pick to squash for the second commit and then save and quit — that'll combine the contents of the two commits together and open up your $EDITOR again to confirm the commit message.

Here's a more in-depth example: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

samelawrence commented 10 years ago

@evilstreak Thanks for the help. Should be good to go now!

evilstreak commented 10 years ago

Thanks!