From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Dec 2008 02:18:50 +0000 (-0800)
Subject: Merge branch 'st/maint-tag' into maint
X-Git-Tag: v1.6.1-rc1~5^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=27f64962f1a573126c0e85cb7c83aa75b669ce07;p=git.git

Merge branch 'st/maint-tag' into maint

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

27f64962f1a573126c0e85cb7c83aa75b669ce07