diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:37 -0800 |
| commit | 43c5fe1c1d9435b60277b38e8b52a29c635cff9a (patch) | |
| tree | 2ed886e42d9fe993fb4ff1daac486981ebde6a40 | |
| parent | 6511cb33c918e5156cfff32f70b33dc65380760e (diff) | |
| parent | d3a8caebf38b42d8d8ca80cb1856ee2e54fb4c4d (diff) | |
| download | git-43c5fe1c1d9435b60277b38e8b52a29c635cff9a.tar.xz | |
Merge branch 'nn/doc-rebase-merges'
Doc update.
* nn/doc-rebase-merges:
doc: improve readability of --rebase-merges in git-rebase
| -rw-r--r-- | Documentation/git-rebase.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 639a4179d1..0c4f038dd6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -443,8 +443,8 @@ the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified). + The `--rebase-merges` mode is similar in spirit to the deprecated -`--preserve-merges`, but in contrast to that option works well in interactive -rebases: commits can be reordered, inserted and dropped at will. +`--preserve-merges` but works with interactive rebases, +where commits can be reordered, inserted and dropped at will. + It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via |