GIT 1.5.2

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 7dbdb26988b9832fed04ebce9dfbd0bdf091d5dc..6195715dc78a26ce9ac452bd64852455fb79137c 100644 (file)
--- a/Documentation/RelNotes-1.5.2.txt
+++ b/Documentation/RelNotes-1.5.2.txt
@@ -1,18 +1,18 @@
-GIT v1.5.2 Release Notes (draft)
+GIT v1.5.2 Release Notes

 ========================
 
 Updates since v1.5.1
 --------------------
 
 ========================
 
 Updates since v1.5.1
 --------------------
 

-* Plumbing level subproject support.
+* Plumbing level superproject support.

 
   You can include a subdirectory that has an independent git
 
   You can include a subdirectory that has an independent git

-  repository in your index and tree objects as a
-  "subproject".  This plumbing (i.e. "core") level subproject
-  support explicitly excludes recursive behaviour.
+  repository in your index and tree objects of your project
+  ("superproject").  This plumbing (i.e. "core") level
+  superproject support explicitly excludes recursive behaviour.

 
 

-  The "subproject" entries in the index and trees are
-  incompatible with older versions of git.  Experimenting with
+  The "subproject" entries in the index and trees of a superproject
+  are incompatible with older versions of git.  Experimenting with

   the plumbing level support is encouraged, but be warned that
   unless everybody in your project updates to this release or
   later, using this feature would make your project
   the plumbing level support is encouraged, but be warned that
   unless everybody in your project updates to this release or
   later, using this feature would make your project


@@ -33,7 +33,8 @@ Updates since v1.5.1
   but this feature is an extremely sharp-edged razor and needs
   to be handled with caution (do not use it unless you
   understand the earlier mailing list discussion on keyword
   but this feature is an extremely sharp-edged razor and needs
   to be handled with caution (do not use it unless you
   understand the earlier mailing list discussion on keyword

-  expansion).
+  expansion).  These conversions apply when checking files in
+  or out, and exporting via git-archive.

 
 * The packfile format now optionally suports 64-bit index.
 
 
 * The packfile format now optionally suports 64-bit index.
 


@@ -42,12 +43,13 @@ Updates since v1.5.1
   needs more than 32-bit to express offsets of objects in the
   pack.
 
   needs more than 32-bit to express offsets of objects in the
   pack.
 

-* Comes with an updated git-gui 0.7.0
+* Comes with an updated git-gui 0.7.1

 
 * Updated gitweb:
 
   - can show combined diff for merges;
   - uses font size of user's preference, not hardcoded in pixels;
 
 * Updated gitweb:
 
   - can show combined diff for merges;
   - uses font size of user's preference, not hardcoded in pixels;

+  - can now 'grep';

 
 * New commands and options.
 
 
 * New commands and options.
 


@@ -190,12 +192,6 @@ this release, unless otherwise noted.
 
   - "git clean -d -X" now does not remove non-excluded directories.
 
 
   - "git clean -d -X" now does not remove non-excluded directories.
 

-* Documentation updates
-
-* Performance Tweaks
-
---
-exec >/var/tmp/1
-O=v1.5.2-rc3
-echo O=`git describe refs/heads/master`
-git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
+  - rebasing (without -m) a series that changes a symlink to a directory
+    in the middle of a path confused git-apply greatly and refused to
+    operate.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 157ef29131ebcdbd60f81507681e68ac84ce307c..98860af0455ebb5290e7225e6ac677dc7ab3268c 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -41,9 +41,16 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v1.5.1.5/git.html[documentation for release 1.5.1.5]
+* link:v1.5.2/git.html[documentation for release 1.5.2]

 
 

-* release notes for link:RelNotes-1.5.1.5.txt[1.5.1.5],
+* release notes for
+  link:RelNotes-1.5.2.txt[1.5.2].
+
+* link:v1.5.1.6/git.html[documentation for release 1.5.1.6]
+
+* release notes for
+  link:RelNotes-1.5.1.6.txt[1.5.1.6],
+  link:RelNotes-1.5.1.5.txt[1.5.1.5],

   link:RelNotes-1.5.1.4.txt[1.5.1.4],
   link:RelNotes-1.5.1.3.txt[1.5.1.3],
   link:RelNotes-1.5.1.2.txt[1.5.1.2],
   link:RelNotes-1.5.1.4.txt[1.5.1.4],
   link:RelNotes-1.5.1.3.txt[1.5.1.3],
   link:RelNotes-1.5.1.2.txt[1.5.1.2],


@@ -52,7 +59,8 @@ Documentation for older releases are available here:
 
 * link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
 
 
 * link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
 

-* release notes for link:RelNotes-1.5.0.7.txt[1.5.0.7],
+* release notes for
+  link:RelNotes-1.5.0.7.txt[1.5.0.7],

   link:RelNotes-1.5.0.6.txt[1.5.0.6],
   link:RelNotes-1.5.0.5.txt[1.5.0.5],
   link:RelNotes-1.5.0.3.txt[1.5.0.3],
   link:RelNotes-1.5.0.6.txt[1.5.0.6],
   link:RelNotes-1.5.0.5.txt[1.5.0.5],
   link:RelNotes-1.5.0.3.txt[1.5.0.3],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index bd4a0443c4a7307dc1a2e756f3daa4e62c55a4bb..06c360b267f0d9e459e44ccaa81dd16b4384c627 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-rc3.GIT
+DEF_VER=v1.5.2.GIT

 
 LF='
 '
 
 LF='
 '