-diff --git a/Documentation/RelNotes-1.5.2.2.txt b/Documentation/RelNotes-1.5.2.2.txt
+diff --git a/Documentation/RelNotes-1.5.2.3.txt b/Documentation/RelNotes-1.5.2.3.txt
new file mode 100644
-index 0000000..e7cecc8
+index 0000000..6ba264d
--- /dev/null
-+++ b/Documentation/RelNotes-1.5.2.2.txt
-@@ -0,0 +1,40 @@
-+GIT v1.5.2.2 Release Notes
++++ b/Documentation/RelNotes-1.5.2.3.txt
+@@ -0,0 +1,26 @@
++GIT v1.5.2.3 Release Notes
+==========================
+
-+Fixes since v1.5.2.1
++Fixes since v1.5.2.2
+--------------------
+
-+* Usability fix
++ * Bugfixes
+
-+ - git-gui is shipped with its updated blame interface. It is
-+ rumored that the older one was not just unusable but was
-+ active health hazard, but this one is actually pretty.
-+ Please see for yourself.
++ - Version 2 pack index format was introduced in version 1.5.2
++ to support pack files that has offset that cannot be
++ represented in 32-bit. The runtime code to validate such
++ an index mishandled such an index for an empty pack.
+
-+* Bugfixes
++ - Commit walkers (most notably, fetch over http protocol)
++ tried to traverse commit objects contained in trees (aka
++ subproject); they shouldn't.
+
-+ - "git checkout fubar" was utterly confused when there is a
-+ branch fubar and a tag fubar at the same time. It correctly
-+ checks out the branch fubar now.
++ * Documentation Fixes and Updates
+
-+ - "git clone /path/foo" to clone a local /path/foo.git
-+ repository left an incorrect configuration.
++ - git-config --regexp was not documented properly.
+
-+ - "git send-email" correctly unquotes RFC 2047 quoted names in
-+ the patch-email before using their values.
-+
-+ - We did not accept number of seconds since epoch older than
-+ year 2000 as a valid timestamp. We now interpret positive
-+ integers more than 8 digits as such, which allows us to
-+ express timestamps more recent than March 1973.
-+
-+ - git-cvsimport did not work when you have GIT_DIR to point
-+ your repository at a nonstandard location.
-+
-+* Many documentation updates
-+
-+--
++--
+exec >/var/tmp/1
-+O=v1.5.2.1-67-g4f01d0f
++O=v1.5.2.2-11-gb833651
+echo O=`git describe refs/heads/maint`
+git shortlog --no-merges $O..refs/heads/maint
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
-index bd30398..3c3cd2f 100755
+index 3c3cd2f..5c6d2b2 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
--DEF_VER=v1.5.2.1.GIT
-+DEF_VER=v1.5.2.2.GIT
+-DEF_VER=v1.5.2.2.GIT
++DEF_VER=v1.5.2.3.GIT
LF='
'
diff --git a/RelNotes b/RelNotes
-index 403fb97..61f9778 120000
+index 61f9778..a1c82a8 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
--Documentation/RelNotes-1.5.2.1.txt
+-Documentation/RelNotes-1.5.2.2.txt
\ No newline at end of file
-+Documentation/RelNotes-1.5.2.2.txt
++Documentation/RelNotes-1.5.2.3.txt
\ No newline at end of file
-diff --git a/Documentation/RelNotes-1.5.3.txt b/Documentation/RelNotes-1.5.3.txt
-index d111661..4b7f472 100644
---- a/Documentation/RelNotes-1.5.3.txt
-+++ b/Documentation/RelNotes-1.5.3.txt
-@@ -1,4 +1,4 @@
--GIT v1.5.3 Release Notes (draft)
-+GIT v1.5.3 Release Notes
- ========================
-
- Updates since v1.5.2
-@@ -10,8 +10,13 @@ Updates since v1.5.2
- * Thee are a handful pack-objects changes to help you cope better with
- repositories with pathologically large blobs in them.
-
-+* Comes with git-gui 0.8.0.
-+
- * New commands and options.
-
-+ - "git-cvsserver" learned new options (--base-path, --export-all,
-+ --strict-paths) inspired by git-daemon.
-+
- - "git-submodule" command helps you manage the projects from
- the superproject that contain them.
-
-@@ -36,9 +41,39 @@ Updates since v1.5.2
- - "git repack" can be told to split resulting packs to avoid
- exceeding limit specified with "--max-pack-size".
-
-+ - "git fsck" gained --verbose option. This is really really
-+ verbose but it might help you identify exact commit that is
-+ corrupt in your repository.
-+
-+ - "git format-patch" learned --numbered-files option. This
-+ may be useful for MH users.
-+
-+ - "git tag -n -l" shows tag annotations while listing tags.
-+
-+ - "git cvsimport" can optionally use the separate-remote layout.
-+
-+ - "git blame" can be told to see through commits that changes
-+ whitespaces and indentation levels with "-w" option.
-+
- * Updated behavior of existing commands.
-
-- - "git push" pretends that you immediately fetched back from
-+ - "git mergetool" chooses its backend more wisely, taking
-+ notice of its environment such as use of X, Gnome/KDE, etc.
-+
-+ - "gitweb" shows merge commits a lot nicer than before. The
-+ default view uses more compact --cc format, while the UI
-+ allows to choose normal diff with any parent.
-+
-+ - snapshot files "gitweb" creates from a repository at
-+ $path/$project/.git are more useful. We use $project part
-+ in the filename, which we used to discard.
-+
-+ - "git cvsimort" creates lightweight tag; there is not any
-+ interesting information we can record in an annotated tag,
-+ and the handcrafted ones the old code created was not
-+ properly formed anyway.
-+
-+ - "git-push" pretends that you immediately fetched back from
- the remote by updating corresponding remote tracking
- branches if you have any.
-
-@@ -48,17 +83,25 @@ Updates since v1.5.2
- - "git-apply --whitespace=strip" removes blank lines added at
- the end of the file.
-
-- - fetch over git native protocols with -v shows connection
-+ - "git-fetch" over git native protocols with -v shows connection
- status, and the IP address of the other end, to help
- diagnosing problems.
-
-- - core.legacyheaders is no more, although we still can read
-- objects created in a new loose object format.
-+ - We used to have core.legacyheaders configuration, when
-+ set to false, allowed git to write loose objects in a format
-+ that mimicks the format used by objects stored in packs. It
-+ turns out that this was not so useful. Although we will
-+ continue to read objects written in that format, we do not
-+ honor that configuration anymore and create loose objects in
-+ the legacy/traditional format.
-+
-+ - "--find-copies-harder" option to diff family can now be
-+ spelled as "-C -C" for brevity.
-
- - "git-mailsplit" (hence "git-am") can read from Maildir
- formatted mailboxes.
-
-- - "git cvsserver" does not barf upon seeing "cvs login"
-+ - "git-cvsserver" does not barf upon seeing "cvs login"
- request.
-
- - "pack-objects" honors "delta" attribute set in
-@@ -68,10 +111,16 @@ Updates since v1.5.2
- - new-workdir script (in contrib) can now be used with a bare
- repository.
-
-+ - "git-mergetool" learned to use gvimdiff.
-+
-+ - "gitview" (in contrib) has a better blame interface.
-+
-
- * Builds
-
-- -
-+ - old-style function definitions (most notably, a function
-+ without parameter defined with "func()", not "func(void)")
-+ have been eradicated.
-
- * Performance Tweaks
-
-@@ -88,6 +137,10 @@ Updates since v1.5.2
- the object requested the last time, which exploits the
- locality of references.
-
-+ - verifying pack contents done by "git fsck --full" got boost
-+ by carefully choosing the order to verify objects in them.
-+
-+
- Fixes since v1.5.2
- ------------------
-
-@@ -96,14 +149,11 @@ this release, unless otherwise noted.
-
- * Bugfixes
-
-- - .... This has not
-- been backported to 1.5.2.x series, as it is rather an
-- intrusive change.
--
-+ - "gitweb" had trouble handling non UTF-8 text with older
-+ Encode.pm Perl module.
-
- --
- exec >/var/tmp/1
--O=v1.5.2-45-ged82edc
--O=v1.5.2-172-g1a8b769
-+O=v1.5.2.2-236-g952c8c5
- 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 06c360b..3c0032c 100755
--- a/GIT-VERSION-GEN
projects / thirdparty / git.git / commitdiff
