main/git: upgrade to 2.2.1