diff options
| author |  Naveen Nathan <naveen@lastninja.net> | 2019-11-12 10:21:37 +1100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-11-12 13:14:19 +0900 |
| commit | d3a8caebf38b42d8d8ca80cb1856ee2e54fb4c4d (patch) | |
| tree | 4b0c1cf9d4657c6ce2accc73a71f541de8b9ef15 | |
| parent | The first batch post 2.24 cycle (diff) | |
| download | tgif-d3a8caebf38b42d8d8ca80cb1856ee2e54fb4c4d.tar.xz | |
doc: improve readability of --rebase-merges in git-rebase
When --preserve-merges was deprecated in 427c3bd28a a sentence
was introduced describing the difference between --rebase-merges and
--preserve-merges which is a little unclear and difficult to parse.
This patch improves readability while retaining original meaning.
Signed-off-by: Naveen Nathan <naveen@lastninja.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 |