public interface GitMerge
Modifier and Type | Method and Description |
---|---|
GitMergeBuilder |
normal()
Creates a builder which can be used to create a
command for running git merge . |
GitSquashMergeBuilder |
squash()
Creates a builder which can be used to create a
command for running git merge
--squash , which will not produce a merge commit and, instead, will merge incoming changes into the work
tree and then exit. |
@Nonnull GitMergeBuilder normal()
command
for running git merge
.
Whether or not a merge commit is created will depend on the configuration of the created command, and on
the commits being merged.@Nonnull GitSquashMergeBuilder squash()
command
for running git merge
--squash
, which will not produce a merge commit and, instead, will merge incoming changes into the work
tree and then exit.
When using git merge --squash
, the commit
must be performed explicitly. Prior to committing the changes, arbitrary additional work can be done, as well
as directly controlling the commit details.
Copyright © 2019 Atlassian. All rights reserved.