Handle non-merge commits as well