projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 960ac5f 6a7f71d)
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)
* maint-1.7.2:
  fast-import: introduce "feature notes" command
  fast-import: clarify documentation of "feature" command

1  2 
Documentation/git-fast-import.txt patch | diff1 | diff2 | blob | history
fast-import.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-fast-import.txt
Simple merge
diff --cc fast-import.c
Simple merge
Git—the stupid content tracker