summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-31 14:57:10 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-31 14:57:10 -0700
commit52735a689270bb1de94eb3de198594b36caed9bb (patch)
tree0fa9d886b6d277acb47e7e893bce706574057197 /Documentation/RelNotes
parentad00aebfe93b3fc79c5ed54569f1603b8030783a (diff)
downloadgit-52735a689270bb1de94eb3de198594b36caed9bb.tar.gz
Git 2.3.5v2.3.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes')
-rw-r--r--Documentation/RelNotes/2.3.5.txt3
1 files changed, 3 insertions, 0 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.