From 74c7495b1a92433d6d8d577831b73b1ecffcaaf4 Mon Sep 17 00:00:00 2001 From: epriestley Date: Sat, 12 Dec 2015 09:38:32 -0800 Subject: [PATCH] Clarify that "arc land" means it is merging changes, not branch refences Summary: Ref T9973. Make this language unambiguously clear about the underlying operations. Test Plan: Ran `arc help land`. Reviewers: chad Reviewed By: chad Maniphest Tasks: T9973 Differential Revision: https://secure.phabricator.com/D14754 --- src/workflow/ArcanistLandWorkflow.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php index 23b0b7b4..884f3a54 100644 --- a/src/workflow/ArcanistLandWorkflow.php +++ b/src/workflow/ArcanistLandWorkflow.php @@ -87,19 +87,23 @@ EOTEXT With **--preview**, execution stops here, before the change is merged. - The change is merged into the target branch, following these rules: + The change is merged with the changes in the target branch, + following these rules: - In mutable repositories or with **--squash**, this will perform a - squash merge (the entire branch will be represented as one commit on - the target branch). + In repositories with mutable history or with **--squash**, this will + perform a squash merge (the entire branch will be represented as one + commit after the merge). - In immutable repositories or with **--merge**, this will perform a - strict merge (a merge commit will always be created, and local - commits will be preserved). + In repositories with immutable history or with **--merge**, this will + perform a strict merge (a merge commit will always be created, and + local commits will be preserved). The resulting commit will be given an up-to-date commit message describing the final state of the revision in Differential. + In Git, the merge occurs in a detached HEAD. The local branch + reference (if one exists) is not updated yet. + With **--hold**, execution stops here, before the change is pushed. The change is pushed into the remote.