From dea4dc4c0aa81bec4ebce68c7e47c86135c84e16 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sat, 2 May 2020 12:03:06 +0800
Subject: [PATCH] .asf.yaml: Disable squash and merge option

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 .asf.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index ddcc89cd7..31267a11d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -14,9 +14,9 @@ github:
     - mcu
     - microcontroller
   enabled_merge_buttons:
-    # enable squash button:
-    squash:  true
-    # enable merge button:
-    merge:   true
+    # disable squash button:
+    squash:  false
+    # disable merge button:
+    merge:   false
     # enable rebase button:
     rebase:  true