| commit | a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 00:40:12 +0000 (9 16:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 00:40:12 +0000 (9 16:40 -0800) | ||
| tree | 8a4b75f257082a2361eb75d963a7bc8546bbfc07 | treesnapshot (tar.gz zip) |
| parent | 59ab4eb36e20b0df9231e736f7d685fb43ad9364 | commitdiff |
| parent | 547e8b9205349b47003ed25a82673e413e71c255 | commitdiff |
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
* 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 | blobhistory |
| fast-import.c | diff1 | diff2 | blobhistory |
| t/t9301-fast-import-notes.sh | diff1 | diff2 | blobhistory |