diff --git a/scripts/import-packages b/scripts/import-packages index 50ad3f9d4..a1ed9e4fb 100755 --- a/scripts/import-packages +++ b/scripts/import-packages @@ -78,6 +78,6 @@ do move_"$move" "$pkg" "packages/$pkg" # merge and delete master branch - git merge --allow-unrelated-histories "$pkg/master" + git merge --no-ff --allow-unrelated-histories "$pkg/master" git branch -d "$pkg/master" done