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 /git-lost-found.sh | |
parent | Merge branch 'maint' (diff) | |
parent | GIT 1.5.0.2 (diff) | |
download | tgif-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 'git-lost-found.sh')
0 files changed, 0 insertions, 0 deletions