Merge branch 'ondrej/update-git-replay-merge' into 'master'

Update the git-replay-merge to use the latest GitLab -o options

See merge request !2503
3 jobs for master in 3 minutes and 55 seconds (queued for 2 minutes and 57 seconds)
Status Job ID Name Coverage
  Precheck
passed #385508
linux amd64
autoreconf:sid:amd64

00:00:34

 
  Docs
passed #385509
linux amd64
docs:sid:amd64

00:02:50

 
  Push
passed #385510
linux amd64
push:docs:sid:amd64

00:00:29