quilt for git (including some changes for my maintainer work)