D14346.diff
No OneTemporary
Actions

Size

549 B

Referenced Files

None

Subscribers

None

D14346.diff
View Options

	diff --git a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
	--- a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
	+++ b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
	@@ -432,7 +432,7 @@
	$src_ref);

	$command = csprintf(
	- 'git merge --no-stat --squash --ff-only -- %R',
	+ 'git merge --no-stat --squash -- %R',
	$src_ref);

	try {