Merge branch 'sr/gfi-options' into next
commit5f6b0ffff13f5cd762d0a5a4e1c4dede58e8a537
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Sep 2009 00:21:20 +0000 (7 17:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Sep 2009 00:21:20 +0000 (7 17:21 -0700)
treeb642a9f52f6f1a589ded2bca7961d2e19633fe18
parent36221999e8996397c28d65b1d0eccdc7bf1b369c
parent91d578a91f3c9d2371d3f6b988b57cc0653a19c9
Merge branch 'sr/gfi-options' into next

* sr/gfi-options:
  fast-import: test the new option command
  fast-import: add option command
  fast-import: test the new feature command
  fast-import: add feature command
  fast-import: put marks reading in it's own function
  fast-import: put option parsing code in separate functions