From: Junio C Hamano Date: Mon, 26 Feb 2007 07:58:50 +0000 (-0800) Subject: GIT 1.5.0.2 X-Git-Tag: v1.5.0.2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c24c69110fe7d6783c0319d52887a113b5ead8b3;p=git.git GIT 1.5.0.2 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes-1.5.0.2.txt b/Documentation/RelNotes-1.5.0.2.txt index 4dc134485..b061e50ff 100644 --- a/Documentation/RelNotes-1.5.0.2.txt +++ b/Documentation/RelNotes-1.5.0.2.txt @@ -6,6 +6,14 @@ Fixes since v1.5.0.1 * Bugfixes + - Automated merge conflict handling when changes to symbolic + links conflicted were completely broken. The merge-resolve + strategy created a regular file with conflict markers in it + in place of the symbolic link. The default strategy, + merge-recursive was even more broken. It removed the path + that was pointed at by the symbolic link. Both of these + problems have been fixed. + - 'git diff maint master next' did not correctly give combined diff across three trees. @@ -39,21 +47,19 @@ Fixes since v1.5.0.1 impossible to repack after accumulating many (small) packs in the repository. + - 'git-diff' to review the combined diff during a conflicted + merge were not reading the working tree version correctly + when changes to a symbolic link conflicted. It should have + read the data using readlink(2) but read from the regular + file the symbolic link pointed at. + + - 'git-remote' did not like period in a remote's name. + * Documentation updates - added and clarified core.bare, core.legacyheaders configurations. - updated "git-clone --depth" documentation. -* Assorted git-gui fixes. - --- -exec >/var/tmp/1 -O=v1.5.0.1-35-gffa84ff -echo O=`git describe maint` -git shortlog --no-merges $O..maint - -#Local Variables: -#mode: text -#End: +* Assorted git-gui fixes. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 9133a00b2..32a942233 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.0.1.GIT +DEF_VER=v1.5.0.2.GIT LF=' '