From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Feb 2007 08:32:19 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~129
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8807d321af394ffb2180d085669337bcd5018c50;p=git.git

Merge branch 'maint'

* maint:
  GIT 1.5.0.2
  git-remote: support remotes with a dot in the name
  Documentation: describe "-f/-t/-m" options to "git-remote add"
  diff --cc: fix display of symlink conflicts during a merge.
---

8807d321af394ffb2180d085669337bcd5018c50