git2-rs

Merge pull request #1096 from kjughx/backcompat-traits

Maintain backwards compatibility for bitflags types

Merge pull request #1075 from sheremetyev/hide-console-windows

Merge pull request #1088 from gitbutlerapp/add-merge-base-octopus

Added merge_base_octopus