-
-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update merge script and update libgit2 version
- Loading branch information
Showing
2 changed files
with
13 additions
and
4 deletions.
There are no files selected for viewing
Submodule libgit2
updated
from 424117 to 80357f
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 |
---|---|---|
@@ -1,10 +1,17 @@ | ||
declare -a branches=("origin/fetch_annotated_tags" "origin/blame_abort" "origin/disableRenameDetection" "origin/checkout_deletion_notification" "origin/diff_checkout" "origin/fix_push_callback_issues" "origin/disable_mmap" "origin/context_line_accessor´" "origin/disableRenameDetection" "origin/submodule" "origin/hash" "origin/callback_connect_disconnect" "origin/blame_buffer" "origin/libgit2_includes_public") | ||
declare -a branches=("fetch_annotated_tags" "blame_abort" "disableRenameDetection" "checkout_deletion_notification" "diff_checkout" "fix_push_callback_issues" "disable_mmap" "context_line_accessor´" "disableRenameDetection" "submodule" "hash" "callback_connect_disconnect" "blame_buffer" "libgit2_includes_public") | ||
|
||
cd libgit2 | ||
|
||
git remote remove origin | ||
git remote remove upstream | ||
git remote add origin [email protected]:Murmele/libgit2.git | ||
git remote add upstream https://github.com/libgit2/libgit2.git | ||
|
||
git fetch --all | ||
|
||
for branch in ${branches[@]}; do | ||
echo $branch | ||
git checkout $branch | ||
git checkout -B $branch "origin/$branch" | ||
git rebase upstream/main | ||
done | ||
|
||
|
@@ -15,4 +22,6 @@ for branch in ${branches[@]}; do | |
git merge --no-edit $branch | ||
done | ||
|
||
echo "Script finished. Check if all branches are rebased correctly and push them to origin!" | ||
git push --force origin | ||
|
||
echo "Script finished. Check if all branches are rebased correctly and push them to origin!" |