git rebase

Reference: https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/