Does this mean to rebase the merge commit itself, or rebase the set of changes being merged?