Rebase instruction include the deprecated --preserve-merges option

[choznerol]

bors/homu suggest using git rebase upstream/master -p

Example

rust-lang/cargo#14078 (comment)

But -p (or --rebase-merges) has been removed in git 2.34.0 back in 2021.

* The "--preserve-merges" option of "git rebase" has been removed.

so you get:

$ git rebase upstream/master -p
fatal: --preserve-merges was replaced by --rebase-merges
Note: Your `pull.rebase` configuration may also be set to 'preserve',
which is no longer supported; use 'merges' instead

$ git rebase upstream/master --preserve-merges
fatal: --preserve-merges was replaced by --rebase-merges
Note: Your `pull.rebase` configuration may also be set to 'preserve',
which is no longer supported; use 'merges' instead

Since the change is trivial, I'll just make a PR to update it here:

homu/homu/main.py

Line 950 in f652a9e

'3. `git rebase upstream/master -p` *(rebase on top of it)*\n'

Reference:

• Similar issue: Git no longer supports 'preserve-merges', stop offering that option
• Old doc that still include --preserve-merges: https://git-scm.com/docs/git-rebase/2.28.0#Documentation/git-rebase.txt---preserve-merges