[orc] branch branch-1.5 updated: ORC-725: Disable merge commits from Github `Merge Button` (#622)

[do...@apache.org]

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

dongjoon pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/orc.git


The following commit(s) were added to refs/heads/branch-1.5 by this push:
     new cb42b10  ORC-725: Disable merge commits from Github `Merge Button` (#622)
cb42b10 is described below

commit cb42b109c0d93dc0baf66e8fb188f3639b098b0c
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Mon Jan 11 00:32:43 2021 -0800

    ORC-725: Disable merge commits from Github `Merge Button` (#622)
    
    ### What changes were proposed in this pull request?
    
    According to the infra team's guide, [INFRA-21289](https://issues.apache.org/jira/browse/INFRA-21289
    ), this PR aims to disable merge commits from GitHub `Merge Button`.
    
    ### Why are the changes needed?
    
    This will prevent accidental merge commits.
    
    This PR follows the guide
    - https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features#git.asf.yamlfeatures-Mergebuttons
    
    ### How was this patch tested?
    
    N/A
    
    (cherry picked from commit 898e4480a546752a281d8f1362813459db213a0c)
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
    (cherry picked from commit 194759e5596fcefc3118dda54ecab478c955660b)
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
 .asf.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..f2a5eac
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,5 @@
+github:
+  enabled_merge_buttons:
+    merge: false
+    squash: true
+    rebase: true