Code

Merge branch 'maint-1.7.2' into maint-1.7.3
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2011 22:32:59 +0000 (14:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2011 22:32:59 +0000 (14:32 -0800)
commitda656f17d37fe96454645c08f21a24134f5aa900
tree4fb50c4122a0e00a9fd2baac4849d0249b818113
parent960ac5ff99304404d287b8174d7c8a7743c6d97a
parent6a7f71d376becc1a5b0357b682dd0c20842104b0
Merge branch 'maint-1.7.2' into maint-1.7.3

* maint-1.7.2:
  fast-import: introduce "feature notes" command
  fast-import: clarify documentation of "feature" command
Documentation/git-fast-import.txt
fast-import.c