Merge branch 'master' into upstream_master

Author: aminya

.gitattributes

@@ -15,3 +15,13 @@ spec/fixtures/sample.txt text eol=lf
 
 # Windows bash scripts are also Unix LF endings
 *.sh		eol=lf
+
+# The script executables should be LF so they can be edited on Windows
+script/bootstrap text eol=lf
+script/build text eol=lf
+script/cibuild text eol=lf
+script/clean text eol=lf
+script/lint text eol=lf
+script/postprocess-junit-results text eol=lf
+script/test text eol=lf
+script/verify-snapshot-script text eol=lf

.github/pull.yml

@@ -0,0 +1,7 @@
+version: "1"
+rules:                      # Array of rules
+  - base: upstream_master   # Required. Target branch
+    upstream: atom:master   # Required. Must be in the same fork network.
+    mergeMethod: hardreset  # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
+    mergeUnstable: true     # Optional, merge pull request even when the mergeable_state is not clean. Default: false
+label: ":arrow_heading_down: pull upstream"  # Optional

.github/workflows/rebase.yml

@@ -0,0 +1,18 @@
+on:
+  issue_comment:
+    types: [created]
+name: Automatic Rebase
+jobs:
+  rebase:
+    name: Rebase
+    if: github.event.issue.pull_request != '' && github.event.comment.author_association == 'MEMBER' && contains(github.event.comment.body, '/rebase')
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the latest code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Automatic Rebase
+      uses: cirrus-actions/rebase@1.3.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}