summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/2.3.5.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-31 21:58:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-31 21:58:38 (GMT)
commitcf8a8c6bd53c43e29cb735eb7934ffc996475d77 (patch)
treea50e887cc7bed478902004e88322f2542f3d16a5 /Documentation/RelNotes/2.3.5.txt
parenta3b75b3ccbc0f8128937d3b393837c2a74f2b662 (diff)
parent52735a689270bb1de94eb3de198594b36caed9bb (diff)
downloadgit-cf8a8c6bd53c43e29cb735eb7934ffc996475d77.zip
git-cf8a8c6bd53c43e29cb735eb7934ffc996475d77.tar.gz
git-cf8a8c6bd53c43e29cb735eb7934ffc996475d77.tar.bz2
Sync with 2.3.5
* maint: Git 2.3.5 docs: clarify what git-rebase's "-p" / "--preserve-merges" does
Diffstat (limited to 'Documentation/RelNotes/2.3.5.txt')
-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 c1a7a09..5b309db 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.