| Andrew Scull | 9c7bbdd | 2021-07-15 19:05:19 +0000 | [diff] [blame] | 1 | # Copyright 2021 Google LLC |
| 2 | # |
| 3 | # Licensed under the Apache License, Version 2.0 (the "License"); you may not |
| 4 | # use this file except in compliance with the License. You may obtain a copy of |
| 5 | # the License at |
| 6 | # |
| 7 | # https://www.apache.org/licenses/LICENSE-2.0 |
| 8 | # |
| 9 | # Unless required by applicable law or agreed to in writing, software |
| 10 | # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT |
| 11 | # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the |
| 12 | # License for the specific language governing permissions and limitations under |
| 13 | # the License. |
| 14 | |
| 15 | # Fetches and merges upstream changes. Upload the resulting tree will produce a |
| 16 | # single merge CL despite appearing as though there will be a CL for each |
| 17 | # commit. |
| 18 | |
| 19 | git fetch aosp upstream-main |
| 20 | git merge aosp/upstream-main |