From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 9 May 2009 16:27:43 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~173
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0;p=git.git

Merge branch 'maint'

* maint:
  Documentation: cloning to empty directory is allowed
  Clarify kind of conflict in merge-one-file helper
  git config: clarify --add and --get-color
  archive-tar.c: squelch a type mismatch warning
---

6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0