You can use separate branches for those sets of changes and fork them off the specific commit you want them pinned to, then use the rebase for a head, yes.