Merge branch 'master' into next
commit9f575b9c1a2fdd0193dd78710583f0d3af731920
authorJunio C Hamano <junkio@cox.net>
Tue, 6 Jun 2006 05:36:35 +0000 (5 22:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 6 Jun 2006 05:36:35 +0000 (5 22:36 -0700)
tree670caa6756d942f9fc1dc4c3673e6bd1782e489d
parentc49b5a3c891e34f6fea9f73847322e9447db91df
parent16cee38ae2bff93a4e4c512550fb4ccac035a3a1
Merge branch 'master' into next

* master:
  rev-parse: tighten constness properly.
  A Perforce importer for git.