Setup and Config
Getting and Creating Projects
Branching and Merging
Sharing and Updating Projects
Inspection and Comparison
- Command-line interface conventions
- Everyday Git
- 2.25.1 → 2.26.0 no changes
- 2.25.0 01/13/20
- 2.24.1 no changes
- 2.24.0 11/04/19
- 2.22.2 → 2.23.1 no changes
- 2.22.1 08/11/19
- 2.22.0 06/07/19
- 2.17.1 → 2.21.1 no changes
- 2.17.0 04/02/18
- 2.16.1 → 2.16.6 no changes
- 2.16.0 01/17/18
- 2.15.3 → 2.15.4 no changes
- 2.15.2 05/22/18
- 2.9.1 → 2.14.6 no changes
- 2.9.0 06/13/16
- 2.8.5 → 2.8.6 no changes
- 2.8.4 06/06/16
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.
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-editoption can be used to accept the auto-generated message (this is generally discouraged). The
-e) option is still useful if you are giving a draft message with the
-moption 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_AUTOEDITcan be set to
noat the beginning of them.
When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior.
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.
Refuse to merge and exit with a non-zero status unless the current
HEADis already up to date or the merge can be resolved as a fast-forward.
GPG-sign the resulting merge commit. The
keyidargument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space.
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.
With --no-log do not list one-line descriptions from the actual commits being merged.
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.
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 commitcommand 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>
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
-soption, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise).
- -X <option>
Pass merge strategy specific option through to the merge strategy.
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.
Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future.
Operate quietly. Implies --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.
git mergecommand 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.