rebase docs: recommend `-r` over `-p`
commit7948b49ac7be06dd926b5a86e70f7f40f3041899
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 28 May 2019 12:42:16 +0000 (28 05:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 May 2019 20:22:35 +0000 (28 13:22 -0700)
tree4869569ea21baabb444ed8eccbf9601311acec58
parent7401ab92f8c9c9f7c81763d6f7da8a63a258eff2
rebase docs: recommend `-r` over `-p`

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>
Documentation/git-rebase.txt