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

Merge branch 'maint-1.7.1' into maint-1.7.2

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

6a7f71d376becc1a5b0357b682dd0c20842104b0