Merge branch 'development'
Merge branch 'development'
git_checkout_opts -> git_checkout_options
git_revert_opts -> git_revert_options
Merge pull request #2028 from libgit2/options-names

Rename options structures
Update clar to e1990d6
Merge pull request #2170 from ethomson/clar

Update clar to e1990d6
Merge branch 'master' of https://github.com/libgit2/libgit2 into development
Merge branch 'development' of https://github.com/libgit2/libgit2 into development