![[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) |
* 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.
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.
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git-remote.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-remote.txt
Simple merge