Skip to content

Commit

Permalink
Add a script to pull changes to subtrees from their upstream repos.
Browse files Browse the repository at this point in the history
  • Loading branch information
Screwtapello committed Sep 10, 2020
1 parent 3670095 commit 5e53d63
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions update-subtrees.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/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

# Merge changes from hunterk's shader repository.
git subtree pull --prefix=extras/both/Shaders https://github.com/hizzlekizzle/quark-shaders.git master

0 comments on commit 5e53d63

Please sign in to comment.