From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 May 2019 17:50:45 +0000 (-0700)
Subject: Merge branch 'js/rebase-deprecate-preserve-merges'
X-Git-Tag: v2.22.0-rc2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2656eceae7dba180fb59a8ccbb448d8710c9f2d8

Merge branch 'js/rebase-deprecate-preserve-merges'

A bit more leftover clean-up to deprepcate "rebase -p".

* js/rebase-deprecate-preserve-merges:
rebase docs: recommend `-r` over `-p`
docs: say that `--rebase=preserve` is deprecated
tests: mark a couple more test cases as requiring `rebase -p`
---

2656eceae7dba180fb59a8ccbb448d8710c9f2d8