Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commit1aa79f2a909abae7872cbbcba8efbbc8a5930d17
authorJakub Narebski <jnareb@gmail.com>
Mon, 16 Oct 2006 08:59:37 +0000 (16 10:59 +0200)
committerJakub Narebski <jnareb@gmail.com>
Mon, 16 Oct 2006 08:59:37 +0000 (16 10:59 +0200)
treeb5c997862ac62e1aee6559f23418a58bf4950368
parent133b360759eb90a3695d290fbc0e46692803a153
parentb32db4d0faec35ad8e6af35c54c37036b3d6c02f
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  svnimport: Fix broken tags being generated
  Replace open-coded version of hash_sha1_file()
  Make write_sha1_file_prepare() void