search

rikai / OpenYourMouth

Open Source Recipes from the Jupiter Broadcasting community
GNU General Public License v2.0
156 stars 79 forks source link

Denny's Special Spaghetti #32

Open ghost opened 9 years ago

ghost commented 9 years ago

This is the way I normally make my spaghetti, hope you guys enjoy :) Also I hope I made this pull request thingy right, I'm a newbie to github, also I only know html not markdown so I hope that its ok being in html...

ghost commented 9 years ago

wow the community is hella good, someone in irc converted my html to markdown credit goes to Coreyok96 in irc for that

pintjuk commented 9 years ago

rikai will probably tell you what he told me, when i posted a similar pull request.

If you wouldn't mind, could you squash your commits to a single commit and resubmit? Can learn about that here

Good chance to learn about ways to keep the commit log tidy! :)

ghost commented 9 years ago

I'm sorry, I'm new to github

pintjuk commented 9 years ago

fixed the link

ghost commented 9 years ago

what link?

pintjuk commented 9 years ago

this

ghost commented 9 years ago

uh thanks, was going through some guides earlier, tho they weren't too great, even the git man pages weren't all that helpful.

rikai commented 9 years ago

It might actually be better in your case to grab the .md version, save it somewhere. Delete your copy of the repo, fork it again & add that one .md version. Only markdown will be accepted anyway and that'll minimize the amount of effort. If you're in the mood for learning though, i'll post links to the proper git way of doing things below.

First, i'd do some formatting cleanup to look a bit more clean. See some of markdown code for the other recipes in the repo to see how to do that.

Then, make sure you're in sync with the master repo by rebasing to master, as is explained here. During that process you'll be able to pick, squash & remove commits. You can probably remove 3514f5b, 58f025f & 599ab24 as they're not going to be accepted. Then you can pick b853e2a as that's your initial commit of your markdown and squash 74a2fa7 & adf1eaf which will merge them into b853e2a and make them a single commit.

If you have multiple formatting commits after that as well, either squish them into the main commit, or pick one and squish the others into that commit. Hope that helps.

It'll keep the commit log nice and tidy and helps you learn some git in the process! :)

ghost commented 9 years ago

Thanks for the info, I'll tkae a look a look at the link. Hmm, I thought only the final commit counted, but alright I'l clean it up and remake the repo like you said, thanks.