commit - 4cc0851e23123ddf7f312ece3b974f652d01c6b9
commit + efba105ab196c6eb41746c1bf4e45164573715f0
blob - a11e0d04ec6b48b470eb5d9507fdf09ccf710f36
blob + 52eeeda8df9fb52a8581faa28c2d29c19ca5a2be
--- got/got.1
+++ got/got.1
Merge the specified
.Ar branch
into the current branch of the work tree.
-If the branches have diverged, creates a merge commit.
-Otherwise, if
+If the branches have diverged, merge changes into the work tree
+and create a merge commit.
+Otherwise, if the specified
.Ar branch
-already includes all commits from the work tree's branch, updates the work
-tree's branch to be the same as
+is already based on the work tree's current branch, make the work tree's
+current branch equivalent to the specified
.Ar branch
-without creating a commit, and updates the work tree to the most recent commit
-on the branch.
-.Pp
-If a linear project history is desired, then use of
-.Cm got rebase
-should be preferred over
-.Cm got merge .
-However, even strictly linear projects may require merge commits in order
-to merge in new versions of third-party code stored on vendor branches
-created with
-.Cm got import .
+and update files in the work tree accordingly.
.Pp
Merge commits are commits based on multiple parent commits.
-The tip commit of the work tree's current branch, which must be in the
+The tip commit of the work tree's current branch will be used as the
+first parent.
+The tip commit of the specified
+.Ar branch
+will be used as the second parent.
+The work tree's current branch
+must be in the
.Dq refs/heads/
-reference namespace and must be set with
+reference namespace and can be set with
.Cm got update -b
before starting the
.Cm merge
-operation, will be used as the first parent.
-The tip commit of the specified
-.Ar branch
-will be used as the second parent.
+operation.
.Pp
No ancestral relationship between the two branches is required.
If the two branches have already been merged previously, only new changes
If more than one branch needs to be merged, then multiple merge commits
with two parents each can be created in sequence.
.Pp
+If a linear project history is desired, then use of
+.Cm got rebase
+should generally be preferred over
+.Cm got merge .
+However, even strictly linear projects may require occasional merge commits,
+for example in order to merge in new versions of third-party code stored
+on
+.Dq vendor
+branches created with
+.Cm got import .
+.Pp
+.Pp
While merging changes found on the
.Ar branch
into the work tree, show the status of each affected file,