My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 567323d 547e8b9)
Merge branch 'maint-1.7.0' into maint-1.7.1
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2011 22:32:47 +0000 (14:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2011 22:32:47 +0000 (14:32 -0800)
* maint-1.7.0:
  fast-import: introduce "feature notes" command
  fast-import: clarify documentation of "feature" command

1  2 
fast-import.c patch | diff1 | diff2 | blob | history

diff --cc fast-import.c
Simple merge
The core git plumbing