It's pretty straightforward -- always rebase your feature branch on top of your upstream before you merge, ensuring that the merge is a fast-forward and your feature branch's history is at the end.

This also gives you a chance to fix up any conflicts before merging, instead of possibly having to merge twice.