![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Feb 2007 08:32:19 +0000 (00:32 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Feb 2007 08:32:19 +0000 (00:32 -0800) | ||
| commit | 8807d321af394ffb2180d085669337bcd5018c50 | |
| tree | 2956464a49a82a210612a2ea030a6affc12a67aa | tree | snapshot |
| parent | 5569dad48e22e7b373ce3ffcc32758163bbd7b42 | commit | diff |
| parent | 0d9b9ab1284ce125fd49cf7dbf4d28e0540cf035 | commit | diff |
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.
* 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.
| Documentation/git-remote.txt | diff1 | | diff2 | | blob | history |