mirror of
https://github.com/RetroDECK/net.rpcs3.RPCS3.git
synced 2025-04-10 19:15:12 +00:00
Compare commits
16 commits
master-126
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
ac91fee758 | ||
|
9a114e4879 | ||
|
4d650135a7 | ||
|
de7a817398 | ||
|
0046281c72 | ||
![]() |
4b9a6d470f | ||
![]() |
16f0b6bd0d | ||
![]() |
437eb07388 | ||
![]() |
5bccde0d96 | ||
|
a226507ec8 | ||
|
59f9242e0c | ||
|
0a2a94cc76 | ||
|
12ac2fbeb5 | ||
![]() |
12e8d54241 | ||
![]() |
f5ca018ff5 | ||
![]() |
86e2ae9771 |
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,3 +1,4 @@
|
|||
/.flatpak-builder/
|
||||
/.build/
|
||||
/repo/
|
||||
./.vscode
|
||||
|
|
|
@ -97,5 +97,4 @@ modules:
|
|||
sources:
|
||||
- type: git
|
||||
url: https://github.com/RPCS3/rpcs3.git
|
||||
branch: master
|
||||
#commit: cb3662cc4d114db7bc580370dc3d89e58ee2af72
|
||||
commit: 665bb8329786e39aca0fd082870ae83996c06c56
|
|
@ -1 +1 @@
|
|||
Subproject commit d47140b52c6ef4a9ae61fe0fda3b31c3e36f2291
|
||||
Subproject commit 627dcefe587e693ff99269361f1d0cdf10aac340
|
|
@ -1,4 +1,32 @@
|
|||
#!/bin/bash
|
||||
|
||||
git fetch https://github.com/flathub/net.rpcs3.RPCS3 master # Fetch the latest changes from the remote master branch
|
||||
git merge FETCH_HEAD # Merge the fetched changes into your current branch
|
||||
target_branch="master"
|
||||
update_submodules="true"
|
||||
|
||||
# Get the repository name
|
||||
repo_url=$(git remote get-url origin)
|
||||
repo_name=$(basename -s .git "$repo_url")
|
||||
|
||||
echo "Fetching https://github.com/flathub/$repo_name $target_branch"
|
||||
if [ "$update_submodules" = "true" ]; then
|
||||
echo "And updating submodules also"
|
||||
fi
|
||||
echo ""
|
||||
|
||||
# Fetch the latest changes from the remote master branch
|
||||
git fetch https://github.com/flathub/"$repo_name" "$target_branch"
|
||||
|
||||
# Merge the fetched changes into your current branch
|
||||
git merge FETCH_HEAD
|
||||
|
||||
if [ "$update_submodules" = "true" ]; then
|
||||
# Update submodules to the versions specified in the repo
|
||||
git submodule update --init --recursive
|
||||
|
||||
# Update submodules to the versions specified in the fetched repo
|
||||
git submodule update --remote
|
||||
git add shared-modules
|
||||
git commit -m "Update shared modules"
|
||||
fi
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue