El Dorado

If I have forked your el-dorado repository (which I have) and I make a change you don't like (for example, the changes I like to the breadcrumb code), can you pull the commits you do like and ignore the changes you don't like?

In other words, can I make changes (in git-speak, I guess that's a push?) to and keep my site up-to-date with my fork of el-dorado, while handing changes we both want over to you without effecting my current version of the fork?

I'm having trouble putting my question into words.

After forking your repository, I'll create a branch in my repository I'll call trevorturk. Then I can fetch your latest changes into that branch, checkout that branch, and merge the changes I want into my master branch.

Mostly I'm looking at this guide for how to do this.

Will this method allow me to maintain my fork seperately from yours while still allowing us to share changes that both of us like?

Yeah, I think that's it. You might want to have a branch called "irken" or something with your changes, and then you would have the master still correspond to mine. The way you're describing should work, too, though.