From 562e8ff38c43117e12543f980d117065b4d0dedd Mon Sep 17 00:00:00 2001 From: KHOUBZA Younes Date: Sun, 2 May 2021 13:12:40 +0000 Subject: [PATCH] pull modification from split replositories before push --- bin/split.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/split.sh b/bin/split.sh index 96bdec99..aaa25140 100755 --- a/bin/split.sh +++ b/bin/split.sh @@ -7,8 +7,9 @@ CURRENT_BRANCH="main" function split() { + git merge --strategy recursive --strategy-option subtree="$1" "$2/$CURRENT_BRANCH" --allow-unrelated-histories -m "Merge remote-tracking branch '$2/$CURRENT_BRANCH'" SHA1=$(./bin/splitsh-lite --prefix="$1") - git push "$2" "$SHA1:refs/heads/$CURRENT_BRANCH" -f + git push $2 "$SHA1:refs/heads/$CURRENT_BRANCH" -f } function remote()