Avoid unwanted merge commits and other commits when doing pull request on GitHub

Question

I forked a project on Github.

Let the remote upstream be upstream and my remote repository be origin. My local master branch is se

Answer 1

This looks like an answer to your question (section "Update 2011-04-15" of the topic):

Git workflow and rebase vs merge questions

Micah describes the technique of squash merges which let you merge changes from your feature branch as a single commit to the master branch.