diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -2522,6 +2522,10 @@
   }
 
   private function checkRevisionOwnership(array $revision) {
+    if ($this->getConfigFromAnySource('diff.amend-without-commandeer')) {
+      return;
+    }
+
     if ($revision['authorPHID'] == $this->getUserPHID()) {
       return;
     }