@matheusbsbs / matheus-bagliano / commits / 0d9b9ab128
Fork 0

GIT 1.5.0.2

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Feb 25, 2007 at 23:58 UTC 0d9b9ab1284ce125fd49cf7dbf4d28e0540cf035
2 files changed +18 -12
Documentation/RelNotes-1.5.0.2.txt
+17 -11
@@ -6,6 +6,14 @@ Fixes since v1.5.0.1
6
7 * Bugfixes
8
9 + - Automated merge conflict handling when changes to symbolic
10 + links conflicted were completely broken. The merge-resolve
11 + strategy created a regular file with conflict markers in it
12 + in place of the symbolic link. The default strategy,
13 + merge-recursive was even more broken. It removed the path
14 + that was pointed at by the symbolic link. Both of these
15 + problems have been fixed.
16 +
17 - 'git diff maint master next' did not correctly give combined
18 diff across three trees.
19
@@ -39,21 +47,19 @@ Fixes since v1.5.0.1
47 impossible to repack after accumulating many (small) packs
48 in the repository.
49
50 + - 'git-diff' to review the combined diff during a conflicted
51 + merge were not reading the working tree version correctly
52 + when changes to a symbolic link conflicted. It should have
53 + read the data using readlink(2) but read from the regular
54 + file the symbolic link pointed at.
55 +
56 + - 'git-remote' did not like period in a remote's name.
57 +
58 * Documentation updates
59
60 - added and clarified core.bare, core.legacyheaders configurations.
61
62 - updated "git-clone --depth" documentation.
63
48 -* Assorted git-gui fixes.
64
50 -
51 ---
52 -exec >/var/tmp/1
53 -O=v1.5.0.1-35-gffa84ff
54 -echo O=`git describe maint`
55 -git shortlog --no-merges $O..maint
56 -
57 -#Local Variables:
58 -#mode: text
59 -#End:
65 +* Assorted git-gui fixes.
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.5.0.1.GIT
4 +DEF_VER=v1.5.0.2.GIT
5
6 LF='
7 '