Abort Abort the current conflict resolution process, and try to reconstruct the pre-merge state.

AllowUnrelatedHistories By default, git merge command refuses to merge histories that do not share a common ancestor.

Commit Perform the merge and commit the result.

Commits <commit>..

Continue After a git merge stops due to conflicts you can conclude the merge by running git merge --continue (see 'HOW TO RESOLVE CONFLICTS' section below).

Edit Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge.

Ff When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit.

FfOnly Refuse to merge and exit with a non-zero status unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward.

GpgSign GPG-sign the resulting merge commit.

Log In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged.

M Set the commit message to be used for the merge commit (in case one is created).

NoCommit With --no-commit perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing.

NoEdit Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge.

NoFf Create a merge commit even when the merge resolves as a fast-forward.

NoLog In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged.

NoProgress Turn progress on/off explicitly.

NoRerereAutoupdate Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible.

NoSquash Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit).

NoStat Show a diffstat at the end of the merge.

NoSummary Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future.

NoVerifySignatures Verify that the tip commit of the side branch being merged is signed with a valid key, i.e.

Progress Turn progress on/off explicitly.

Quiet Operate quietly.

RerereAutoupdate Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible.

Squash Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit).

Stat Show a diffstat at the end of the merge.

Strategy Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried.

StrategyOption Pass merge strategy specific option through to the merge strategy.

Summary Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future.

Verbose Be verbose.

VerifySignatures Verify that the tip commit of the side branch being merged is signed with a valid key, i.e.