From 7c1f363a8ccca59618781e646ed1ba51c1b28d13 Mon Sep 17 00:00:00 2001 From: Ruslan Tretiakov <54504545+rtretiakov@users.noreply.github.com> Date: Wed, 30 Sep 2020 13:22:15 -0400 Subject: [PATCH] Add update-subtrees.sh based on script from higan --- update-subtrees.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 update-subtrees.sh diff --git a/update-subtrees.sh b/update-subtrees.sh new file mode 100755 index 00000000..c4e53e26 --- /dev/null +++ b/update-subtrees.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# +# Because git subtree doesn't provide an easy way to automatically merge changes +# from upstream, this shell script will do the job instead. +# If you don't have a POSIX-compatible shell on your system, feel free to use +# this as a reference for what commands to run, rather than running it directly. + +# Change to the directory containing this script, or exit with failure +# to prevent git subtree scrawling over some other repo. +cd "$(dirname "$0")" || exit 1 + +# Merge changes from the libco repository. +git subtree pull --prefix=libco https://github.com/higan-emu/libco.git master