Merge branch 'st/maint-tag' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Dec 2008 02:18:50 +0000 (18:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Dec 2008 02:18:50 +0000 (18:18 -0800)
* st/maint-tag:
tag: Add more tests about mixing incompatible modes and options
tag: Check that options are only allowed in the appropriate mode

1  2 
builtin-tag.c
diff --cc builtin-tag.c
Simple merge