Merge branch 'master' of github.com:iamogbz/oss-boilerplate

iamogbz · Jun 27, 2019 · ade500d · ade500d
2 parents e238264 + 72af0fb
commit ade500d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,8 @@ upstream:
 eject:
 	@git fetch --all --prune
 	@git checkout -b boilerplate-ejection
-	@git pull upstream boilerplate-ejection --rebase -Xours
+	@git pull upstream master --allow-unrelated-histories --no-edit -Xours
+	@git pull upstream boilerplate-ejection --no-edit -Xours
 	@git reset master --soft && git add --all && git commit -m "chore: eject"
 	@echo "eject: branch created, complete by replacing placeholder values"