Git Patches with Multiple Commits

rubyonrails-core
1

One thing interesting about Git patches is that they include the separate commits made, not just the diff. You can see this ticket for an example:

http://rails.lighthouseapp.com/attachments/24383/block_support_for_create_through_association.diff

Is it preferred that we merge multiple commits into one commit before submitting a patch? Is there an easy way to do this?

2

For larger chunks of work, multiple commits are fine. However if it's fixing one logical thing, one commit is probably nicer for everyone.

To merge your stuff into one commit you can either use git merge --squash or git rebase --interactive and squash them all together.