Skip to content

Commit

Permalink
update merge script
Browse files Browse the repository at this point in the history
  • Loading branch information
Murmele committed Aug 29, 2022
1 parent ef5bda3 commit e24c7fb
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions dep/libgit2/rebaseGittyupLibgit2.sh
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

Expand All @@ -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!"

0 comments on commit e24c7fb

Please sign in to comment.