Git merge 命令

git-merge - Join two or more development histories together

语法

git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
        [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
        [--[no-]allow-unrelated-histories]
        [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
git merge --abort
git merge --continue

参数

--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, --no-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. The --no-edit option can be used to accept the auto-generated message (this is generally
    discouraged). The --edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line
    and want to edit it in the editor.

    Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an
    editor opened when they run git merge. To make it easier to adjust such scripts to the updated behaviour, the environment variable
    GIT_MERGE_AUTOEDIT can be set to no at the beginning of them.

--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. This is the default behaviour when merging an annotated (and
    possibly signed) tag.

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

-S[<keyid>], --gpg-sign[=<keyid>]
    GPG-sign the resulting merge commit. The keyid argument is optional and defaults to the committer identity; if specified, it must
    be stuck to the option without a space.

--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, move the HEAD, or 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.

--verify-signatures, --no-verify-signatures
    Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the
    default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not
    signed with a valid key, the merge is aborted.

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

--allow-unrelated-histories
    By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override
    this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no
    configuration variable to enable this by default exists and will not be added.

--signoff
    Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but
    it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer
    Certificate of Origin (see http://developercertificate.org/ for more information).

-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. The automated message can
    include the branch description.

--[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.

--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).

<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, 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.

    When FETCH_HEAD (and no other commit) is specified, the branches recorded in the .git/FETCH_HEAD file by the previous invocation of
    git fetch for merging are merged to the current branch.

PRE-MERGE CHECKS
Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if there
    section below).

<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, 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.

    When FETCH_HEAD (and no other commit) is specified, the branches recorded in the .git/FETCH_HEAD file by the previous invocation of
    git fetch for merging are merged to the current branch.

使用示例

# 合并指定分支到当前分支
$ git merge [branch]

查看更多 git merge 命令的使用方法，可以使用命令:

git help merge