Prepare git-tools for merging into the main git archive