Merge branch 'maint'
commitbc9c0248a5cf184756ba562d6c452cace8863517
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Nov 2008 05:33:55 +0000 (8 21:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Nov 2008 05:33:55 +0000 (8 21:33 -0800)
treefac1220b800f9656c81ccc4b105a6f7626e850ce
parent5fe9cd02c2639dbe4430fab6bc220d561b28aa93
parent7c181d627c136cbc67ef0f722e74e34017e662f0
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
builtin-send-pack.c
refs.c