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.
Junio C Hamano committed
Feb 26, 2007 at 00:32 UTC
8807d321af394ffb2180d085669337bcd5018c50
No changes.