On Tue, Sep 07 2021, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@xxxxxx>
> [...]
> --p::
> ---preserve-merges::
> - [DEPRECATED: use `--rebase-merges` instead] Recreate merge commits
> - instead of flattening the history by replaying commits a merge commit
> - introduces. Merge conflict resolutions or manual amendments to merge
> - commits are not preserved.
[In reply to an old commit]
I opened "man git-rebase" today due to an on-list discussion and went
through pretty much:
1. /preserve-merges # fails
2. skimming the SYNOPSIS, forgetting what the new thing is called
3. Paging down, eventually findinging & remembering the new thing is
"--rebase-merges".
I wonder if there's objections to reinstating this in the docs
somewhere, just as something like:
--preserve-merges:
An old "rebase" backend which is no longer supported,
and which was removed from git in version v2.35.0.
We don't do that with all flags that we've dropped, but perhaps this one
was well known enough to not leave readers hanging...
