From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Mar 2008 20:35:18 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=319a36a5c2da8dd07993caac43b7820bff3b0d37;p=git.git

Merge branch 'maint'

* maint:
  Update draft release notes for 1.5.4.5
  Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
  t/t3800-mktag.sh: use test_must_fail rather than '!'

Conflicts:

	t/t3800-mktag.sh
---

319a36a5c2da8dd07993caac43b7820bff3b0d37