Git 2.3.5

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

diff --git a/Documentation/RelNotes/2.3.5.txt b/Documentation/RelNotes/2.3.5.txt
index c1a7a0900b8d182fd404e6b60e10cdad7afb7882..5b309db689242d8602e8b42d4139b7192ac381a0 100644 (file)
--- a/Documentation/RelNotes/2.3.5.txt
+++ b/Documentation/RelNotes/2.3.5.txt
@@ -38,4 +38,7 @@ Fixes since v2.3.4
    (in contrib/) did not spell ${param/pattern/string} substitution
    correctly, which happened to work with bash but not with zsh.
 
+ * The explanation on "rebase --preserve-merges", "pull --rebase=preserve",
+   and "push --force-with-lease" in the documentation was unclear.
+
 Also contains typofixes, documentation updates and trivial code clean-ups.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index bfa19cb50b0a5ba934c9174d4c03dcc1657ff578..8f5220ce47a663180911d4cd4b783f5df18f9385 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:
 
-* link:v2.3.4/git.html[documentation for release 2.3.4]
+* link:v2.3.5/git.html[documentation for release 2.3.5]
 
 * release notes for
+  link:RelNotes/2.3.5.txt[2.3.5],
   link:RelNotes/2.3.4.txt[2.3.4],
   link:RelNotes/2.3.3.txt[2.3.3],
   link:RelNotes/2.3.2.txt[2.3.2],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 9905751fc2406d135ee2f855e3d9f9897f95da84..7e0ccef568eae0f85f571ed3470fbeee22886b3d 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.3.4
+DEF_VER=v2.3.5
 
 LF='
 '