doc: improve readability of --rebase-merges in git-rebase
authorNaveen Nathan <naveen@lastninja.net>
Mon, 11 Nov 2019 23:21:37 +0000 (10:21 +1100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Nov 2019 04:14:19 +0000 (13:14 +0900)
commitd3a8caebf38b42d8d8ca80cb1856ee2e54fb4c4d
tree4b0c1cf9d4657c6ce2accc73a71f541de8b9ef15
parentd9f6f3b6195a0ca35642561e530798ad1469bd41
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>
Documentation/git-rebase.txt