From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Jan 2010 23:58:11 +0000 (-0800)
Subject: Merge branch 'sr/gfi-options'
X-Git-Tag: v1.7.0-rc0~95
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa232d457ebc1620ab31be504068c38403497179;p=git.git

Merge branch 'sr/gfi-options'

* sr/gfi-options:
  fast-import: add (non-)relative-marks feature
  fast-import: allow for multiple --import-marks= arguments
  fast-import: test the new option command
  fast-import: add option command
  fast-import: add feature command
  fast-import: put marks reading in its own function
  fast-import: put option parsing code in separate functions
---

fa232d457ebc1620ab31be504068c38403497179