Magit is a fantastic tool when you have a messy feature branch. You can reorder, amend and squash commits painlessly! (It helps my git-fu)