0bcf584992
For a default git config it's enough to pull with --no-ff to ensure that a merge commit is created, but with a custom configuration, it's better to also explicitly prevent rebasing. Message-Id: <7dc6027f1f38fa4db7435592a3b72308b1a08614.1616063525.git.sarna@scylladb.com>