archlinux/linux-seba
1
0
Fork 0
generated from archlinux/template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update prerun

Browse Source
This commit is contained in:
Sebastiaan de Schaetzen 2025-05-01 15:55:05 +02:00
parent 4be52dbba3
commit 85574ebd9d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prerun.sh
View File

@ -1,4 +1,4 @@
git remote add aur https://aur.archlinux.org/REPO_NAME.git git remote add upstream https://gitlab.archlinux.org/archlinux/packaging/packages/linux.git
git fetch aur git fetch upstream
git merge -X theirs --no-edit aur/master git merge -X theirs --no-edit upstream/main