opendev/git-review
Code Issues Proposed changes

Add release note for the rebase merge handling fix

Browse Source 
In preparation for a new release, include a release note about an
important fix we added recently.

Change-Id: Icfe0594cc1a4526e0781ac47c0d5f60bbcdce0e3
This commit is contained in:
Jeremy Stanley 2021-11-23 18:59:24 +00:00
parent 7182166ec0
commit 25c2d3fe96
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
releasenotes/notes/use-rebase-merges-2550c9573cfbf39a.yaml Normal file
View File

@ -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.