This sounds great Lukas! I'd just like to add that care must be taken when re-basing on shared branches. I can see the complexity of managing the rebases increasing dramatically when more than two developpers are invloved.
I agree with Brian here on the complexity of the rebasing, but I'm also not sure of the alternative if we want this type of behavior.
We just need to make sure the steps are property highlighted, and move on. We can always ajust if this starts to be a problem.
The alternative is merge commits. Merge commits are non-destructive to clones of the branch. Basically what I'm saying is if we require rebases on the branches to keep the commit timeline linear, we may be introducing artificail complexity.
But I think Jay has it right, let's go with this for now, and adjust if there is a problem.