From e24c7fbdb0665ca105996dbb2e5f9071792cac07 Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Mon, 29 Aug 2022 14:43:14 +0200 Subject: [PATCH] update merge script --- dep/libgit2/rebaseGittyupLibgit2.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dep/libgit2/rebaseGittyupLibgit2.sh b/dep/libgit2/rebaseGittyupLibgit2.sh index 291f9b3e6..944097977 100644 --- a/dep/libgit2/rebaseGittyupLibgit2.sh +++ b/dep/libgit2/rebaseGittyupLibgit2.sh @@ -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 git@github.com: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!" \ No newline at end of file +git push --force origin + +echo "Script finished. Check if all branches are rebased correctly and push them to origin!"