From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Feb 2011 00:41:16 +0000 (-0800)
Subject: Merge branch 'rr/fi-import-marks-if-exists'
X-Git-Tag: v1.7.5-rc0~142
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fc180d98a20b6270ec25ca19c8d18a0a1286fe15;p=git.git

Merge branch 'rr/fi-import-marks-if-exists'

* rr/fi-import-marks-if-exists:
  fast-import: Introduce --import-marks-if-exists
---

fc180d98a20b6270ec25ca19c8d18a0a1286fe15