git absorb is great, use it all the time.