You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
23 lines
327 B
23 lines
327 B
set -v
|
|
|
|
wait() {
|
|
echo "Fix any merge conflicts / etc then resume by entering here: "
|
|
read _
|
|
}
|
|
|
|
echo "This may go very wrong. Enter at your own risk."
|
|
|
|
git checkout config-qwerty
|
|
git merge master
|
|
wait
|
|
|
|
util/export-universal.sh
|
|
|
|
git checkout config-installer
|
|
git merge master
|
|
wait
|
|
|
|
util/export-installers.sh
|
|
|
|
echo "Done???"
|
|
|