diff options
Diffstat (limited to 'android_merge_from_upstream.sh')
| -rwxr-xr-x | android_merge_from_upstream.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_merge_from_upstream.sh b/android_merge_from_upstream.sh index b63eb6e1..65b47d7b 100755 --- a/android_merge_from_upstream.sh +++ b/android_merge_from_upstream.sh @@ -13,7 +13,7 @@ local_branch_name="merge_with_upstream" local_upstream="aosp/master" remote="aosp" -remote_branch="${remote}/upstream-mirror-master" +remote_branch="${remote}/upstream-main" my_dir="$(dirname "$(readlink -m "$0")")" cd "${my_dir}" |