From 8637560166a9ee045fe3266268aa041cd9ca8413 Mon Sep 17 00:00:00 2001
From: Nathan McKinley <nmckinley@google.com>
Date: Wed, 22 Jan 2020 14:04:29 -0800
Subject: [PATCH] With --no-ff, create a merge commit in all cases, even when
 the (#3009)

Merged PR #3009.
---
 .ci/gcb-generate-diffs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ci/gcb-generate-diffs.yml b/.ci/gcb-generate-diffs.yml
index f42b3110aca4..cb23778d9022 100644
--- a/.ci/gcb-generate-diffs.yml
+++ b/.ci/gcb-generate-diffs.yml
@@ -55,6 +55,7 @@ steps:
       id: merged
       args:
           - merge
+          - --no-ff
           - head/$_HEAD_BRANCH
 
     - name: 'gcr.io/graphite-docker-images/downstream-builder'