summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-03 19:16:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-03 19:16:56 (GMT)
commita155a5f075cdc09e584a58d68bdce0c80e6c4b5a (patch)
treec1d832b9771c7fabc992c9adc4b0db65c69106bb
parent2951add0e908f04fd63b48b8fcc138ae4dd66116 (diff)
downloadgit-a155a5f075cdc09e584a58d68bdce0c80e6c4b5a.zip
git-a155a5f075cdc09e584a58d68bdce0c80e6c4b5a.tar.gz
git-a155a5f075cdc09e584a58d68bdce0c80e6c4b5a.tar.bz2
Git 1.8.5.1v1.8.5.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.8.5.1.txt9
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 13 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.8.5.1.txt b/Documentation/RelNotes/1.8.5.1.txt
new file mode 100644
index 0000000..7236aaf
--- /dev/null
+++ b/Documentation/RelNotes/1.8.5.1.txt
@@ -0,0 +1,9 @@
+Git v1.8.5.1 Release Notes
+==========================
+
+Fixes since v1.8.5
+------------------
+
+ * "git submodule init" copied "submodule.$name.update" settings from
+ .gitmodules to .git/config without making sure if the suggested
+ value was sensible.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4545afb..4448ce2 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/git.html[documentation for release 1.8.5]
+* link:v1.8.5.1/git.html[documentation for release 1.8.5.1]
* release notes for
+ link:RelNotes/1.8.5.1.txt[1.8.5.1],
link:RelNotes/1.8.5.txt[1.8.5].
* link:v1.8.4.5/git.html[documentation for release 1.8.4.5]
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 99a62f3..6dd0ec1 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.5
+DEF_VER=v1.8.5.1
LF='
'
diff --git a/RelNotes b/RelNotes
index 61c3b54..0064299 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.8.5.txt \ No newline at end of file
+Documentation/RelNotes/1.8.5.1.txt \ No newline at end of file