I usually avoid merge commits in favor of rebases precisely for the reason you describe above.