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.7-rc1~22^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6a7f71d376becc1a5b0357b682dd0c20842104b0?ds=inline;hp=--cc

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