Just learned about 'git absorb' couple of weeks ago and have used it every day since. Amazing tool.