Code

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)
* maint-1.7.1:
  fast-import: introduce "feature notes" command
  fast-import: clarify documentation of "feature" command

1  2 
Documentation/git-fast-import.txt
fast-import.c

Simple merge
diff --cc fast-import.c
Simple merge