A few options to look at specifically: --follow, -M, and -C. Less related to refactoring I also find --first-parent and --merges useful