commit 3856c506a91b55f6a8bc767f394d8feef5fd71f7
author Alexander Martinz <amartinz@shiftphones.com> Tue Apr 09 16:07:34 2024 +0200
committer Alexander Martinz <amartinz@shiftphones.com> Tue Apr 09 17:18:07 2024 +0200
tree 76538e25708c02e0678eaf1717373445509c4c93
parent 252e32e7d95bb0873e8ecedb803dc9c863c4a059

build: envsetup: add merge_upstream

Change-Id: I97feb109fc9fe5eb1c6738aaf1477d28681fb9a6
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>

build/envsetup.sh

diff --git a/build/envsetup.sh b/build/envsetup.sh
index 7d115bc..9d75fe4 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -117,7 +117,14 @@
     generate_changelog HEAD "${1}"
 }
 
-function repopick() {
+function merge_upstream()
+{
+    T=$(gettop)
+    "$T/vendor/shiftos/tools/merge_upstream.py" "$@"
+}
+
+function repopick()
+{
     T=$(gettop)
     "$T/vendor/shiftos/tools/repopick.py" "$@"
 }