Merge branch 'maint-1.7.1' into maint-1.7.2
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2011 22:32:54 +0000 (14:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2011 22:32:54 +0000 (14:32 -0800)
commit6a7f71d376becc1a5b0357b682dd0c20842104b0
treeba879dbaea99673de8f6e7dfca24e8f2e18dc628
parent7a876edf5d5224e0755cfabb808b042f300e293d
parent206af7c96b134b4962fa04fa174a25f29efd7e5e
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
Documentation/git-fast-import.txt
fast-import.c