With --no-ff, create a merge commit in all cases, even when the

merge could instead be resolved as a fast-forward.
GoogleCloudPlatform · Jan 22, 2020 · 94143f2 · 94143f2
1 parent 790accb
commit 94143f2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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'