Interface MergeGitOptions

Aborts the current conflict resolution process, and attempts to reconstruct the pre-merge state.

Permits merge histories that do not share a common ancestor.

Automatically creates a temporary stash entry before the operation begins. See also [--no-autostash.

Determines how the merge message will be cleaned up before committing.

Performs the merge and commits the result.

Concludes the merge once conflicts are resolved.

Resolves the merge as a fast-forward when possible; otherwise, creates a merge commit. See also --ff-only and --no-ff.

Resolves the merge as a fast-forward when possible; otherwise, refuses to merge and exits with a non-zero status. See also --ff and --no-ff.

GPG-sign commits. See also --no-gpg-sign.

Prepares the default merge message as if merging to the branch.

Includes log message with one-line descriptions from at most actual commits that are being merged. See also --no-log.

The complement of --autostash.

Performs the merge and stops just before creating a merge commit.

Creates a merge commit in all cases. See also --ff and --ff-only.

The complement of --gpg-sign.

The complement of --log.

The complement of --overwrite-ignore.

Suppresses progress reports to the standard error stream. See also --progress.

The complement of --rerere-autoupdate.

Does not add a Signed-off-by trailer by the committer at the end of the commit log message. See also --signoff.

Performs the merge and commit the result. See also --squash.

Does not show a diffstat at the end of the merge. See also --stat.

Bypasses the pre-merge and commit-msg hooks. See also --no-verify.

Does not verify the tip commit of the side branch being merged is signed with a valid key. See also --verify-signatures.

Silently overwrites ignored files from the merge result. See also --no-overwrite-ignore.

Forces progress reports to the standard error stream. See also --no-progress.

Operates quietly.

Abandons the the current merge in progress, leaving the index and the working tree as-is.

Allows the rerere mechanism to update the index with the result of auto-conflict resolution. See also --no-rerere-autoupdate.

Adds a Signed-off-by trailer by the committer at the end of the commit log message. See also --no-signoff.

Produces the working tree and index state as if a real merge happened, but does not actually make a commit. See also --no-squash.

Shows a diffstat at the end of the merge. See also --no-stat.

Uses the given merge strategy.

Passes merge strategy-specific option through to the merge strategy.

Be verbose.

The complement of --no-verify.

Verifies the tip commit of the side branch being merged is signed with a valid key. See also --no-verify-signatures.

Sets the commit message to be used for the merge commit.