summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-10 21:49:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-10 22:22:02 (GMT)
commit843142ada000a992fa87bd2dc7796501332a52d9 (patch)
treedcea0ab3229f1a6e84efb952d5143d85fc89817e
parent56822cc9ab9003c80b18201c097e4faa6f0ffbd3 (diff)
downloadgit-843142ada000a992fa87bd2dc7796501332a52d9.zip
git-843142ada000a992fa87bd2dc7796501332a52d9.tar.gz
git-843142ada000a992fa87bd2dc7796501332a52d9.tar.bz2
GIT v1.5.2-rc3v1.5.2-rc3
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/RelNotes-1.5.2.txt9
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.5.2.txt b/Documentation/RelNotes-1.5.2.txt
index c14f3da..42e7fa5 100644
--- a/Documentation/RelNotes-1.5.2.txt
+++ b/Documentation/RelNotes-1.5.2.txt
@@ -44,6 +44,11 @@ Updates since v1.5.1
* Comes with an updated git-gui 0.7.0
+* Updated gitweb:
+
+ - can show combined diff for merges;
+ - uses font size of user's preference, not hardcoded in pixels;
+
* New commands and options.
- "git bisect start" can optionally take a single bad commit and
@@ -141,6 +146,8 @@ Updates since v1.5.1
- Optimized "git-add $path" in a large directory, most of
whose contents are ignored.
+ - Optimized "git-diff-tree" for reduced memory footprint.
+
- The recursive merge strategy updated a worktree file that
was changed identically in two branches, when one of them
renamed it. We do not do that when there is no rename, so
@@ -187,6 +194,6 @@ this release, unless otherwise noted.
--
exec >/var/tmp/1
-O=v1.5.2-rc2-45-g618e613
+O=v1.5.2-rc2-91-g616e40b
echo O=`git describe refs/heads/master`
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f6adb91..bd4a044 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.2-rc2.GIT
+DEF_VER=v1.5.2-rc3.GIT
LF='
'