Merge branch 'jk/init-core-worktree-at-root'

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.