blob: 68ce0b1375b84cb60e615f07d3273830cc0b9716 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
#!/bin/sh
set -e
if git branch|grep -q merge; then
git branch -D merge
fi
if ! git remote|grep -q arch; then
echo "Adding 'arch' remote"
git remote add arch https://gitlab.archlinux.org/archlinux/packaging/packages/linux.git
fi
git fetch arch
git checkout -b merge --no-track arch/main
grep ^pkgver PKGBUILD
grep ^pkgrel PKGBUILD
git checkout master
echo "Automerging configs"
git checkout merge -- config
echo "All done, you can now do git checkout --patch merge PKGBUILD"
|