diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php index bd7e8b65..e2b1009e 100644 --- a/src/workflow/ArcanistLandWorkflow.php +++ b/src/workflow/ArcanistLandWorkflow.php @@ -70,7 +70,8 @@ EOTEXT 'param' => 'master', 'help' => "Land feature branch onto a branch other than ". "'master' (default). You can change the default by setting ". - "'arc.land.onto.default' in your .arcconfig.", + "'arc.land.onto.default' with `arc set-config` or for the ". + "entire project in .arcconfig.", ), 'hold' => array( 'help' => "Prepare the change to be pushed, but do not actually ". @@ -135,7 +136,7 @@ EOTEXT $branch = head($branch); $onto_default = nonempty( - $this->getWorkingCopy()->getConfig('arc.land.onto.default'), + $this->getWorkingCopy()->getConfigFromAnySource('arc.land.onto.default'), 'master'); $remote = $this->getArgument('remote', 'origin'); diff --git a/src/workflow/ArcanistSetConfigWorkflow.php b/src/workflow/ArcanistSetConfigWorkflow.php index fcc7cee8..fab91404 100644 --- a/src/workflow/ArcanistSetConfigWorkflow.php +++ b/src/workflow/ArcanistSetConfigWorkflow.php @@ -159,6 +159,12 @@ EOTEXT 'engine is specified by the current project.', 'example' => 'ExampleUnitTestEngine', ), + 'arc.land.onto.default' => array( + 'help' => + 'The name of the default branch to land changes onto when '. + '`arc land` is run.', + 'example' => 'develop', + ), ); $config = self::readGlobalArcConfig();