rebase docs: recommend `-r` over `-p`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 28 May 2019 12:42:16 +0000 (05:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 May 2019 20:22:35 +0000 (13:22 -0700)
The `--preserve-merges` option is now deprecated in favor of
`--rebase-merges`; Let's stop recommending the former.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found