From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Feb 2011 22:32:47 +0000 (-0800)
Subject: Merge branch 'maint-1.7.0' into maint-1.7.1
X-Git-Tag: v1.7.4.2~16^2~1^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=206af7c96b134b4962fa04fa174a25f29efd7e5e;p=git.git

Merge branch 'maint-1.7.0' into maint-1.7.1

* maint-1.7.0:
  fast-import: introduce "feature notes" command
  fast-import: clarify documentation of "feature" command
---

206af7c96b134b4962fa04fa174a25f29efd7e5e