From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Nov 2008 05:49:25 +0000 (-0800)
Subject: Merge branch 'st/tag'
X-Git-Tag: v1.6.1-rc1~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df5e12f7d405b84de07c3f2dc1afe51b1d594e2c;p=git.git

Merge branch 'st/tag'

* st/tag:
  tag: Add more tests about mixing incompatible modes and options
  tag: Check that options are only allowed in the appropriate mode
---

df5e12f7d405b84de07c3f2dc1afe51b1d594e2c