mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-12-23 14:00:55 +01:00
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
This commit is contained in:
parent
dae2f0073f
commit
74c7495b1a
1 changed files with 11 additions and 7 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue