From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 9 Nov 2008 05:33:55 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~75
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc9c0248a5cf184756ba562d6c452cace8863517;p=git.git

Merge branch 'maint'

* maint:
  GIT 1.6.0.4
  Update RPM spec for the new location of git-cvsserver.
  push: fix local refs update if already up-to-date
  do not force write of packed refs

Conflicts:
	builtin-revert.c
---

bc9c0248a5cf184756ba562d6c452cace8863517