forked from higan-emu/higan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a script to pull changes to subtrees from their upstream repos.
- Loading branch information
1 parent
3670095
commit 5e53d63
Showing
1 changed file
with
16 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |