Switch to normal git pull from --rebase in finish-release

noris-network · Sep 11, 2019 · eec6e49 · eec6e49
1 parent c96fb7c
commit eec6e49
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/release.mk b/release.mk
@@ -77,7 +77,7 @@ finish-release: check-env check-api-key
 	git branch -D prepare_$(VER)
 	git merge --ff master
 	rm -f TAGMESSAGE
-	git pull --rebase
+	git pull
 	python3 tests/scripts/protect-un-protect.py dev
 	git push origin dev
 	python3 tests/scripts/protect-un-protect.py dev