]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 59ab4eb 547e8b9)
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)
commita8e4a5943a63c8fd4a3a9b70ccf4608bcc973707
tree8a4b75f257082a2361eb75d963a7bc8546bbfc07tree | snapshot
parent59ab4eb36e20b0df9231e736f7d685fb43ad9364commit | diff
parent547e8b9205349b47003ed25a82673e413e71c255commit | diff
Merge branch 'maint-1.7.0' into maint

* maint-1.7.0:
  fast-import: introduce "feature notes" command
  fast-import: clarify documentation of "feature" command

Conflicts:
Documentation/git-fast-import.txt
Documentation/git-fast-import.txt diff1 | diff2 | blob | history
fast-import.c diff1 | diff2 | blob | history
t/t9301-fast-import-notes.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.