Git 2.5.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.5.3.txt b/Documentation/RelNotes/2.5.3.txt
new file mode 100644 (file)
index 0000000..d143685
--- /dev/null
+++ b/Documentation/RelNotes/2.5.3.txt
@@ -0,0 +1,17 @@
+Git v2.5.3 Release Notes
+========================
+
+Fixes since v2.5.2
+------------------
+
+ * The experimental untracked-cache feature were buggy when paths with
+   a few levels of subdirectories are involved.
+
+ * Recent versions of scripted "git am" has a performance regression
+   in "git am --skip" codepath, which no longer exists in the
+   built-in version on the 'master' front.  Fix the regression in
+   the last scripted version that appear in 2.5.x maintenance track
+   and older.
+
+Also contains typofixes, documentation updates and trivial code
+clean-ups.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 629e62c9255202642884398efafdc9cd0e876042..2b39aa9f5153846884e4a280102e01f4aad357d1 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the '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:v2.5.2/git.html[documentation for release 2.5.2]
+* link:v2.5.3/git.html[documentation for release 2.5.3]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/2.5.3.txt[2.5.3],

   link:RelNotes/2.5.2.txt[2.5.2],
   link:RelNotes/2.5.1.txt[2.5.1],
   link:RelNotes/2.5.0.txt[2.5].
   link:RelNotes/2.5.2.txt[2.5.2],
   link:RelNotes/2.5.1.txt[2.5.1],
   link:RelNotes/2.5.0.txt[2.5].

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 9e3723eee36895d1652c2d4016cbafaf95506145..7915077d2a0d6785f9194ff00f19a2af090f4d4f 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=v2.5.2
+DEF_VER=v2.5.3

 
 LF='
 '
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 24f83fe617943898ecbd47f3d3c2ef9968a54388..01910c524602b737cedfc0074f2e624ae54c2e2f 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.5.2.txt
\ No newline at end of file
+Documentation/RelNotes/2.5.3.txt
\ No newline at end of file