From a2486f8094e33f638e521c781a5151864559e8fb Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 17 Jun 2020 20:52:39 -0700
Subject: [PATCH] Remove strict from automerge, add rebase opt in

---
 .mergify.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index f0710942ed..9da6c2a958 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,16 +4,27 @@
 #
 # https://doc.mergify.io/
 pull_request_rules:
-  - name: automatic merge on CI success
+  - name: automatic merge (squash) on CI success
     conditions:
       - status-success=buildkite/solana
       #- status-success=Travis CI - Pull Request
       - status-success=ci-gate
       - label=automerge
+      - author≠@dont-squash-my-commits
     actions:
       merge:
         method: squash
-        strict: true
+  # Join the dont-squash-my-commits group if you won't like your commits squashed
+  - name: automatic merge (rebase) on CI success
+    conditions:
+      - status-success=buildkite/solana
+      #- status-success=Travis CI - Pull Request
+      - status-success=ci-gate
+      - label=automerge
+      - author=@dont-squash-my-commits
+    actions:
+      merge:
+        method: rebase
   - name: remove automerge label on CI failure
     conditions:
       - label=automerge