Merge branch 'rr/fi-import-marks-if-exists' into next
commit8c9d4ce7ee71e3333b237212c1471f67e37eb855
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Feb 2011 00:02:20 +0000 (3 16:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Feb 2011 00:02:20 +0000 (3 16:02 -0800)
tree6bde74bd259b2586e07e5047304e1b9d2535edba
parent76586d242e986ae3864485aa61371a04cb08df4e
parentdded4f12a46274753439e3a8fa4eb756c5d14ae1
Merge branch 'rr/fi-import-marks-if-exists' into next

* rr/fi-import-marks-if-exists:
  fast-import: Introduce --import-marks-if-exists
Documentation/git-fast-import.txt
fast-import.c
t/t9300-fast-import.sh