Setup and Config
Getting and Creating Projects
Branching and Merging
Sharing and Updating Projects
Inspection and Comparison
- Command-line interface conventions
- Everyday Git
- Frequently Asked Questions (FAQ)
- All guides...
- 2.18.1 → 2.19.6 no changes
- 2.18.0 06/21/18
- 2.17.0 → 2.17.6 no changes
- 2.16.6 12/06/19
- 2.10.5 → 2.15.4 no changes
- 2.9.5 07/30/17
- 2.6.7 → 2.8.6 no changes
- 2.5.6 05/05/17
- 2.4.12 05/05/17
- 2.3.10 no changes
- 2.2.3 09/04/15
- 2.1.4 12/17/14
Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is "merge", which shows a
<<<<<<<conflict marker, changes made by one side, a
=======marker, changes made by the other side, and then a
>>>>>>>marker. An alternate style, "diff3", adds a
|||||||marker and the original text before the
If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the
branch.<current branch>.mergethat name the branches at the remote named by
branch.<current branch>.remoteare consulted, and then they are mapped via
remote.<remote>.fetchto their corresponding remote-tracking branches, and the tips of these tracking branches are merged.
By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to
false, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the
--no-ffoption from the command line). When set to
only, only such fast-forward merges are allowed (equivalent to giving the
--ff-onlyoption from the command line).
In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false.
In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20.
The number of files to consider when performing rename detection during a merge; if not specified, defaults to the value of diff.renameLimit.
Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section "Merging branches with differing checkin/checkout attributes" in gitattributes.
Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default.
Controls which merge tool is used by git-mergetool. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined.
Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the GIT_MERGE_VERBOSITY environment variable.
Defines a human-readable name for a custom low-level merge driver. See gitattributes for details.
Defines the command that implements a custom low-level merge driver. See gitattributes for details.
Names a low-level merge driver to be used when performing an internal merge between common ancestors. See gitattributes for details.