Code

Merge branch 'rr/fi-import-marks-if-exists' into pu
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
commit27d8082f867b4a8fa284d3eb709c865c13478b66
tree34e70171ed73d937108ae8b9e91f88adbafb1e71
parent3ce29f6aff7bb33cd0be75b558e50ff373f995c3
parentdded4f12a46274753439e3a8fa4eb756c5d14ae1
Merge branch 'rr/fi-import-marks-if-exists' into pu

* 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