GIT v1.5.2-rc3

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

diff --git a/Documentation/RelNotes-1.5.2.txt b/Documentation/RelNotes-1.5.2.txt
index c14f3da7aa76b7bfbe302bc2de5eaa799dfa071c..42e7fa5beccd0a2b5c0b2703cf62034cb1b23ab9 100644 (file)
--- 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
 
 
 * 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
 * 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-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
   - 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
 
 --
 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
 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 f6adb91ed217ca65b5112c9388d286fb4eef19f1..bd4a0443c4a7307dc1a2e756f3daa4e62c55a4bb 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.5.2-rc2.GIT
+DEF_VER=v1.5.2-rc3.GIT

 
 LF='
 '
 
 LF='
 '