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`

diff --combined Documentation/git-rebase.txt
index f5e6ae3907bae3af8a86ae5c43775f9b39c48e47,274870fed4aa3aeb04d5e64e865a3840fbc28288..5e4e9276479c94e8a73ea4cd72819d50ec7b5e91
--- 1/Documentation/git-rebase.txt
--- 2/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -300,11 -300,6 +300,11 @@@ See also INCOMPATIBLE OPTIONS below
  +
  See also INCOMPATIBLE OPTIONS below.
  
 +--rerere-autoupdate::
 +--no-rerere-autoupdate::
 +      Allow the rerere mechanism to update the index with the
 +      result of auto-conflict resolution if possible.
 +
  -S[<keyid>]::
  --gpg-sign[=<keyid>]::
        GPG-sign commits. The `keyid` argument is optional and
@@@ -415,7 -410,7 +415,7 @@@ See also INCOMPATIBLE OPTIONS below
  +
  By default, or when `no-rebase-cousins` was specified, commits which do not
  have `<upstream>` as direct ancestor will keep their original branch point,
 -i.e. commits that would be excluded by gitlink:git-log[1]'s
 +i.e. commits that would be excluded by linkgit:git-log[1]'s
  `--ancestry-path` option will keep their original ancestry by default. If
  the `rebase-cousins` mode is turned on, such commits are instead rebased
  onto `<upstream>` (or `<onto>`, if specified).
@@@ -675,7 -670,8 +675,8 @@@ $ git rebase -i HEAD~
  
  And move the first patch to the end of the list.
  
- You might want to preserve merges, if you have a history like this:
+ You might want to recreate merge commits, e.g. if you have a history
+ like this:
  
  ------------------
             X
@@@ -689,7 -685,7 +690,7 @@@ Suppose you want to rebase the side bra
  sure that the current HEAD is "B", and call
  
  -----------------------------
- $ git rebase -i -p --onto Q O
+ $ git rebase -i -r --onto Q O
  -----------------------------
  
  Reordering and editing commits usually creates untested intermediate