--commit, --no-commit
    Perform the merge and commit the result. This option can be used to override --no-commit.

    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.

--edit, -e
    Invoke editor before committing successful merge to further edit the default merge message.

--ff
    When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge
    commit. This is the default behavior.

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

--ff-only
    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.

--log[=<n>], --no-log
    In addition to branch names, populate the log message with one-line descriptions from at most <n>
    actual commits that are being merged. See also git-fmt-merge-msg(1).

    With --no-log do not list one-line descriptions from the actual commits being merged.

--stat, -n, --no-stat
    Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option
    merge.stat.

    With -n or --no-stat do not show a diffstat at the end of the merge.

--squash, --no-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 or move the HEAD, nor record $GIT_DIR/MERGE_HEAD to
    cause the next git commit command to create a merge commit. This allows you to create a single commit
    on top of the current branch whose effect is the same as merging another branch (or more in case of
    an octopus).

    With --no-squash perform the merge and commit the result. This option can be used to override
    --squash.

-s <strategy>, --strategy=<strategy>
    Use the given merge strategy; can be supplied more than once to specify them in the order they should
    be tried. If there is no -s option, a built-in list of strategies is used instead (git
    merge-recursive when merging a single head, git merge-octopus otherwise).

-X <option>, --strategy-option=<option>
    Pass merge strategy specific option through to the merge strategy.

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

-q, --quiet
    Operate quietly. Implies --no-progress.

-v, --verbose
    Be verbose.

--progress, --no-progress
    Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is
    connected to a terminal. Note that not all merge strategies may support progress reporting.

-m <msg>
    Set the commit message to be used for the merge commit (in case one is created).

    If --log is specified, a shortlog of the commits being merged will be appended to the specified
    message.

    The git fmt-merge-msg command can be used to give a good default for automated git merge invocations.

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

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

           If there were uncommitted worktree changes present when the merge started, git merge --abort will in
           some cases be unable to reconstruct these changes. It is therefore recommended to always commit or
           stash your changes before running git merge.

           git merge --abort is equivalent to git reset --merge when MERGE_HEAD is present.

<commit>...
    Commits, usually other branch heads, to merge into our branch. Specifying more than one commit will
    create a merge with more than two parents (affectionately called an Octopus merge).

    If no commit is given from the command line, and if merge.defaultToUpstream configuration variable is
    set, merge the remote tracking branches that the current branch is configured to use as its upstream.
    See also the configuration section of this manual page.