summaryrefslogtreecommitdiff
path: root/Documentation
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
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')
-rw-r--r--Documentation/RelNotes/2.3.5.txt3
-rw-r--r--Documentation/git-rebase.txt4
-rw-r--r--Documentation/git.txt3
3 files changed, 8 insertions, 2 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.
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index d728030..47984e8 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -362,7 +362,9 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`.
-p::
--preserve-merges::
- Instead of ignoring merges, try to recreate them.
+ Recreate merge commits instead of flattening the history by replaying
+ commits a merge commit introduces. Merge conflict resolutions or manual
+ amendments to merge commits are not preserved.
+
This uses the `--interactive` machinery internally, but combining it
with the `--interactive` option explicitly is generally not a good
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8837862..59e8335 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],