Rebase

Most of the time I use interactive rebase option or else use a GUI for doing a rebase.

Tower - Git app really helps to do rebase properly and gives more context to what is happening on the first instance.