diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-31 14:58:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-31 14:58:38 -0700 |
| commit | cf8a8c6bd53c43e29cb735eb7934ffc996475d77 (patch) | |
| tree | a50e887cc7bed478902004e88322f2542f3d16a5 | |
| parent | Sync with maint (diff) | |
| parent | Git 2.3.5 (diff) | |
| download | tgif-cf8a8c6bd53c43e29cb735eb7934ffc996475d77.tar.xz | |
Sync with 2.3.5
* maint:
Git 2.3.5
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
| -rw-r--r-- | Documentation/RelNotes/2.3.5.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 4 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
3 files changed, 8 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-rebase.txt b/Documentation/git-rebase.txt index d728030590..47984e84ed 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 8837862908..59e8335055 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], |