Perform the merge and commit the result. This option can be used to override --no-commit
--no-commit
Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing
--edit, -e
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
--no-edit
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
--cleanup <mode>
This option determines how the merge message will be cleaned up before committing. See git-commit[1] for more details. In addition, if the <mode> is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict
--ff
When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit
--no-ff
Create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward
--ff-only
Resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status
-S, --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
--no-gpg-sign
Is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign
--log [n]
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]
--no-log
Do not list one-line descriptions from the actual commits being merged
--signoff
Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project
--no-signoff
Can be used to countermand an earlier --signoff option on the command line
--stat
Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat
-n, --no-stat
Do not show a diffstat at the end of the merge
--squash
With --squash, --commit is not allowed, and will fail. 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)
--no-squash
Perform the merge and commit the result. This option can be used to override --squash
--no-verify
This option bypasses the pre-merge and commit-msg hooks. See also githooks[5]
-s, --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, --strategy-option <option>
Pass merge strategy specific option through to the merge strategy
--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
--no-verify-signatures
Do not verify that the tip commit of the side branch being merged is signed with a valid key
--summary
Synonym to --stat ; this is deprecated and will be removed in the future
--no-summary
Synonym to --no-stat ; this is deprecated and will be removed in the future
-q, --quiet
Operate quietly. Implies --no-progress
-v, --verbose
Be verbose
--autostash
Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts
--no-autostash
Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends
--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
--all
Fetch all remotes
-a, --append
Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD
--atomic
Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated
--depth <depth>
Limit fetching to the specified number of commits from the tip of each remote branch history
--deepen <depth>
Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history
--shallow-since <date>
Deepen or shorten the history of a shallow repository to include all reachable commits after <date>
--shallow-exclude <revision>
Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times
--unshallow
If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository
--update-shallow
By default when fetching from a shallow repository, git fetch refuses refs that require updating .git/shallow
--negotiation-tip <commit|glob>
By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile
--dry-run
Show what would be done, without making any changes
-f, --force
This option overrides that check
-k, --keep
Keep downloaded pack
-p, --prune
Before fetching, remove any remote-tracking references that no longer exist on the remote
-P, --prune-tags
Before fetching, remove any local tags that no longer exist on the remote if --prune is enabled
--no-tags
By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following
--refmap <refspec>
When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository
-t, --tags
By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following
--recurse-submodules [mode]
When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository
--no-recurse-submodules
Disable recursive fetching of submodules (this has the same effect as using the --recurse-submodules=no option)
-j, --jobs <n>
Number of parallel children to be used for all forms of fetching
--set-upstream
If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands
--upload-pack <upload-pack>
When given, and the repository to fetch from is handled by git fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end
--progress
Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified
-o, --server-option <option>
Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character
--show-forced-updates
By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs
--no-show-forced-updates
By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons