diff --git a/bin/split b/bin/split index 6ea2e298..9586debe 100755 --- a/bin/split +++ b/bin/split @@ -7,14 +7,13 @@ 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 } function remote() { - git remote add "$1" "$2" || git remote set-url "$1" "$2" || true + git remote add "$1" "$2" || true } git pull origin $CURRENT_BRANCH