summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-17 12:29:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-17 12:29:49 -0700
commit4d8002429fb6c5427d7f3e5481e63d645780a5b7 (patch)
tree3b7ec55e52d19eba1acf8f07ffb0c4dc4a88745f
parentMerge branch 'po/doc-branch-desc' (diff)
parentGit 2.5.3 (diff)
downloadtgif-4d8002429fb6c5427d7f3e5481e63d645780a5b7.tar.xz
Sync with 2.5.3
* maint: Git 2.5.3
-rw-r--r--Documentation/RelNotes/2.5.3.txt17
-rw-r--r--Documentation/git.txt3
2 files changed, 19 insertions, 1 deletions
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 75ffb16d96..8b2dede3e9 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].