From 52735a689270bb1de94eb3de198594b36caed9bb Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Mar 2015 14:57:10 -0700
Subject: [PATCH] Git 2.3.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/RelNotes/2.3.5.txt | 3 +++
Documentation/git.txt | 3 ++-
GIT-VERSION-GEN | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes/2.3.5.txt b/Documentation/RelNotes/2.3.5.txt
index c1a7a0900b..5b309db689 100644
--- 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 bfa19cb50b..8f5220ce47 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.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 9905751fc2..7e0ccef568 100755
--- 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='
'
--
GitLab