Code

Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Thu, 24 May 2007 05:37:23 +0000 (22:37 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 24 May 2007 05:37:23 +0000 (22:37 -0700)
* 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

1  2 
Documentation/config.txt
fast-import.c

Simple merge
diff --cc fast-import.c
Simple merge