From ee6ad5f4d56e697c972af86cbefdf269b386e470 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 17 Sep 2015 12:16:10 -0700 Subject: [PATCH] Git 2.5.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.5.3.txt | 17 +++++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/2.5.3.txt diff --git a/Documentation/RelNotes/2.5.3.txt b/Documentation/RelNotes/2.5.3.txt new file mode 100644 index 0000000000..d1436857cb --- /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 629e62c925..2b39aa9f51 100644 --- 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: -* 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 + 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]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 9e3723eee3..7915077d2a 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.5.2 +DEF_VER=v2.5.3 LF=' ' diff --git a/RelNotes b/RelNotes index 24f83fe617..01910c5246 120000 --- 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 -- 2.11.4.GIT