Merge branch 'ho/dashless' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 21:51:56 +0000 (14:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 21:51:56 +0000 (14:51 -0700)
* ho/dashless:
tests: use "git xyzzy" form (t7200 - t9001)
tests: use "git xyzzy" form (t7000 - t7199)
tests: use "git xyzzy" form (t3600 - t6999)
tests: use "git xyzzy" form (t0000 - t3599)
'git foo' program identifies itself without dash in die() messages
Start conforming code to "git subcmd" style

1  2 
builtin-apply.c
t/t5300-pack-object.sh
diff --cc builtin-apply.c
Simple merge
Simple merge