Administrator/Xen-Orchestra-xen-orchestra-MIRROR
1
0
Fork 1
mirror of https://github.com/vatesfr/xen-orchestra.git synced 2026-11-09 17:06:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(import-packages): force merge (--no-ff)

Browse Source
This commit is contained in:
Julien Fontanet
2019-07-17 16:30:54 +02:00
parent dabc2d0442
commit 6ce35fdfa8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/import-packages
View File

@@ -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