Merge branch 'maint'
commit98ee8187e4e331716be0797169ba9ddbb26efe56
authorJunio C Hamano <junkio@cox.net>
Thu, 24 May 2007 05:37:23 +0000 (23 22:37 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 24 May 2007 05:37:23 +0000 (23 22:37 -0700)
treea4ee87b74fd3c6050e91537314c12c069929e5cc
parent072570ee2689c5f19513157d654f04f5a7113a24
parenta21f0f0a22c513130f1268e3296dd52d47d2f0e0
Merge branch 'maint'

* maint:
  Fix possible coredump with fast-import --import-marks
  Refactor fast-import branch creation from existing commit
  fast-import: Fix crash when referencing already existing objects
  fast-import: Fix uninitialized variable
  Documentation: fix git-config.xml generation
Documentation/config.txt
fast-import.c