From 26fb143bb9ee2f7737a9ea3249b1676976b38497 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 2 May 2020 12:04:09 +0800 Subject: [PATCH 1/2] github: Copy PULL_REQUEST_TEMPLATE.md from nuttx repo Signed-off-by: Xiang Xiao --- .github/PULL_REQUEST_TEMPLATE.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..f0c7312 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,6 @@ +## Summary + +## Impact + +## Testing + From 5aaa56ee9098084f93daaadd85ed756601784bb1 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 2 May 2020 12:04:36 +0800 Subject: [PATCH 2/2] .asf.yaml: Disable squash and merge option Signed-off-by: Xiang Xiao --- .asf.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 80ae5c2..9e05828 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -15,9 +15,9 @@ github: - microcontroller - ci 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