Merge branch 'more-git-plugin-fixes'
Give credit for git plugin updates
Merge branch 'lua-columns-vs-search-highlighting'
git: add :Gopt to config marking unchanged files
git: remove optimization for unchanged subtrees
Don't assume a Lua column is primary on error
Add missing article to matcher_clone()'s comment
Use reset_search_results() in opt_handlers.c