revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-25 16:22:42 +01:00
Code Issues Releases Wiki Activity

Clarify that "arc land" means it is merging changes, not branch refences

Browse source 
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
This commit is contained in:
epriestley 2015-12-12 09:38:32 -08:00
parent dae2f0073f
commit 74c7495b1a
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/workflow/ArcanistLandWorkflow.php
View file

@ -87,19 +87,23 @@ EOTEXT
With **--preview**, execution stops here, before the change is With **--preview**, execution stops here, before the change is
merged. 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 In repositories with mutable history or with **--squash**, this will
squash merge (the entire branch will be represented as one commit on perform a squash merge (the entire branch will be represented as one
the target branch). commit after the merge).
In immutable repositories or with **--merge**, this will perform a In repositories with immutable history or with **--merge**, this will
strict merge (a merge commit will always be created, and local perform a strict merge (a merge commit will always be created, and
commits will be preserved). local commits will be preserved).
The resulting commit will be given an up-to-date commit message The resulting commit will be given an up-to-date commit message
describing the final state of the revision in Differential. 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. With **--hold**, execution stops here, before the change is pushed.
The change is pushed into the remote. The change is pushed into the remote.