You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/05/02 06:12:50 UTC

[incubator-nuttx] 02/02: .asf.yaml: Disable squash and merge option

This is an automated email from the ASF dual-hosted git repository.

btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit b29efe430799c738db1c71a103380cb224beb796
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat May 2 12:00:58 2020 +0800

    .asf.yaml: Disable squash and merge option
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 .asf.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index a325ddb..c1200bb 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