From 56804965e50b0d97b9fb4d9930134707579f9f0f Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 10 Oct 2020 09:33:52 +0200
Subject: [PATCH] Add merge_upstream.sh

---
 merge_upstream.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 merge_upstream.sh

diff --git a/merge_upstream.sh b/merge_upstream.sh
new file mode 100755
index 0000000..754b50c
--- /dev/null
+++ b/merge_upstream.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+mydir="$(dirname "$(realpath "$0")")"
+
+pushd "$mydir" > /dev/null
+
+source ./merge_helpers.sh
+
+
+forall_repos git fetch upstream
+forall_repos git merge upstream/master
+
+popd > /dev/null