From ebba6c0ca617352ceef5caa636ab243f0ef14cc3 Mon Sep 17 00:00:00 2001
From: Thomas Ackermann
Date: Sat, 11 Jan 2014 17:28:25 +0100
Subject: [PATCH 1/2] pack-heuristics.txt: mark up the file header properly
AsciiDoc wants these header-lines left-aligned.
Signed-off-by: Thomas Ackermann
Signed-off-by: Junio C Hamano
---
Documentation/technical/pack-heuristics.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/technical/pack-heuristics.txt b/Documentation/technical/pack-heuristics.txt
index b7bd95152e..95a07db6e8 100644
--- a/Documentation/technical/pack-heuristics.txt
+++ b/Documentation/technical/pack-heuristics.txt
@@ -1,5 +1,5 @@
- Concerning Git's Packing Heuristics
- ===================================
+Concerning Git's Packing Heuristics
+===================================
Oh, here's a really stupid question:
From 4224916ae979204f13db2996d9e32490e0acb90f Mon Sep 17 00:00:00 2001
From: Junio C Hamano
Date: Mon, 13 Jan 2014 11:28:26 -0800
Subject: [PATCH 2/2] Git 1.8.5.3
---
Documentation/RelNotes/1.8.5.3.txt | 27 +++++++++++++++++++++++++++
Documentation/git.txt | 3 ++-
GIT-VERSION-GEN | 2 +-
RelNotes | 2 +-
4 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 Documentation/RelNotes/1.8.5.3.txt
diff --git a/Documentation/RelNotes/1.8.5.3.txt b/Documentation/RelNotes/1.8.5.3.txt
new file mode 100644
index 0000000000..3de2dd0f19
--- /dev/null
+++ b/Documentation/RelNotes/1.8.5.3.txt
@@ -0,0 +1,27 @@
+Git v1.8.5.3 Release Notes
+==========================
+
+Fixes since v1.8.5.2
+--------------------
+
+ * The "--[no-]informative-errors" options to "git daemon" were parsed
+ a bit too loosely, allowing any other string after these option
+ names.
+
+ * A "gc" process running as a different user should be able to stop a
+ new "gc" process from starting.
+
+ * An earlier "clean-up" introduced an unnecessary memory leak to the
+ credential subsystem.
+
+ * "git mv A B/", when B does not exist as a directory, should error
+ out, but it didn't.
+
+ * "git rev-parse -- " did not implement the usual
+ disambiguation rules the commands in the "git log" family used in
+ the same way.
+
+ * "git cat-file --batch=", an admittedly useless command, did not
+ behave very well.
+
+Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index cc0e5e2bfe..388b19633e 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.8.5.2/git.html[documentation for release 1.8.5.2]
+* link:v1.8.5.3/git.html[documentation for release 1.8.5.3]
* release notes for
+ link:RelNotes/1.8.5.3.txt[1.8.5.3],
link:RelNotes/1.8.5.2.txt[1.8.5.2],
link:RelNotes/1.8.5.1.txt[1.8.5.1],
link:RelNotes/1.8.5.txt[1.8.5].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 0ec4d003fa..a8f58ee282 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.5.2
+DEF_VER=v1.8.5.3
LF='
'
diff --git a/RelNotes b/RelNotes
index 1efc120fe0..8e86db6ab6 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.8.5.2.txt
\ No newline at end of file
+Documentation/RelNotes/1.8.5.3.txt
\ No newline at end of file