[PATCH] git bugfixes and cleanups, mainly Debian things