upgrade to latest git, refresh patches