diff --git a/releasenotes/notes/use-rebase-merges-2550c9573cfbf39a.yaml b/releasenotes/notes/use-rebase-merges-2550c9573cfbf39a.yaml new file mode 100644 index 00000000..a4f551e8 --- /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.