Page MenuHomePhabricator
Files F15186980

D14346.id.diff
No OneTemporary
Actions

D14346.id.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 {

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 22, 5:17 AM (4 h, 17 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7179807
Default Alt Text
D14346.id.diff (549 B)

Event Timeline

Phabricator · Built by Phacility