diff options
| author | Jeremy Stanley <fungi@yuggoth.org> | 2021-11-23 18:59:24 +0000 |
|---|---|---|
| committer | Jeremy Stanley <fungi@yuggoth.org> | 2021-11-23 19:48:51 +0000 |
| commit | 25c2d3fe9678bb467952e8203cfc8c40f4a86a87 (patch) | |
| tree | 0fdcbf3cc09ed68dd73a6d2a65b50d27fa5e0744 | |
| parent | 7182166ec00ad3645821435d72c5424b4629165f (diff) | |
| download | git-review-25c2d3fe9678bb467952e8203cfc8c40f4a86a87.tar.gz | |
Add release note for the rebase merge handling fix2.2.0
In preparation for a new release, include a release note about an
important fix we added recently.
Change-Id: Icfe0594cc1a4526e0781ac47c0d5f60bbcdce0e3
| -rw-r--r-- | releasenotes/notes/use-rebase-merges-2550c9573cfbf39a.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/releasenotes/notes/use-rebase-merges-2550c9573cfbf39a.yaml b/releasenotes/notes/use-rebase-merges-2550c9573cfbf39a.yaml new file mode 100644 index 0000000..a4f551e --- /dev/null +++ b/releasenotes/notes/use-rebase-merges-2550c9573cfbf39a.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + With Git 2.18.0 and later, the ``--rebase-merges`` (``-r``) option will + be used in place of the deprecated ``--preserve-merges`` (``-p``) + option. This fixes a critical error when git-review is used with Git + versions 2.34.0 onward, where the old option is no longer available. |