Andrew's git / gitweb.git / diff
?
Merge branch 'st/tag'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:49:25 +0000 (21:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:49:25 +0000 (21:49 -0800)
* st/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 patch | diff1 | diff2 | blob | history
t/t7004-tag.sh patch | diff1 | diff2 | blob | history
diff --cc builtin-tag.c
Simple merge
diff --cc t/t7004-tag.sh
Simple merge