Fix warped Git blame history
Fix warped Git blame history

This will fix git's peculiar view of history. Git views whoever merges in a branch as the person who committed it. This really screws up tools like VSCode, or intelliJ, or git blame. Effectively it kills the line by line history.

This change will eliminate the merge commit when using the squash so as to preserve the correct and expected user history.

I've put it behind the squash_merge check wall to make sure it doesn't affect existing users of Bors.
bors-ng/bors-ng,bors-ng/bors-ng,bors-ng/bors-ng