diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-26 00:32:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-26 00:32:19 -0800 |
| commit | 8807d321af394ffb2180d085669337bcd5018c50 (patch) | |
| tree | 2956464a49a82a210612a2ea030a6affc12a67aa /patch-delta.c | |
| parent | 5569dad48e22e7b373ce3ffcc32758163bbd7b42 (diff) | |
| parent | 0d9b9ab1284ce125fd49cf7dbf4d28e0540cf035 (diff) | |
| download | git-8807d321af394ffb2180d085669337bcd5018c50.tar.gz git-8807d321af394ffb2180d085669337bcd5018c50.tar.xz | |
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.
Diffstat (limited to 'patch-delta.c')
0 files changed, 0 insertions, 0 deletions