summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorNaveen Nathan <naveen@lastninja.net>2019-11-11 23:21:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-12 04:14:19 (GMT)
commitd3a8caebf38b42d8d8ca80cb1856ee2e54fb4c4d (patch)
tree4b0c1cf9d4657c6ce2accc73a71f541de8b9ef15 /builtin
parentd9f6f3b6195a0ca35642561e530798ad1469bd41 (diff)
downloadgit-d3a8caebf38b42d8d8ca80cb1856ee2e54fb4c4d.zip
git-d3a8caebf38b42d8d8ca80cb1856ee2e54fb4c4d.tar.gz
git-d3a8caebf38b42d8d8ca80cb1856ee2e54fb4c4d.tar.bz2
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>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions