Merge with http://www.kernel.org/pub/scm/git/git.git