Andrew's git / gitweb.git / diff
?
Merge branch 'maint-1.7.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:40:12 +0000 (16:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:40:12 +0000 (16:40 -0800)
* maint-1.7.0:
fast-import: introduce "feature notes" command
fast-import: clarify documentation of "feature" command

Conflicts:
Documentation/git-fast-import.txt

No differences found