1merge.conflictStyle:: 2 Specify the style in which conflicted hunks are written out to 3 working tree files upon merge. The default is "merge", which 4 shows a `<<<<<<<` conflict marker, changes made by one side, 5 a `=======` marker, changes made by the other side, and then 6 a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||` 7 marker and the original text before the `=======` marker. 8 9merge.defaultToUpstream:: 10 If merge is called without any commit argument, merge the upstream 11 branches configured for the current branch by using their last 12 observed values stored in their remote-tracking branches. 13 The values of the `branch.<current branch>.merge` that name the 14 branches at the remote named by `branch.<current branch>.remote` 15 are consulted, and then they are mapped via `remote.<remote>.fetch` 16 to their corresponding remote-tracking branches, and the tips of 17 these tracking branches are merged. 18 19merge.ff:: 20 By default, Git does not create an extra merge commit when merging 21 a commit that is a descendant of the current commit. Instead, the 22 tip of the current branch is fast-forwarded. When set to `false`, 23 this variable tells Git to create an extra merge commit in such 24 a case (equivalent to giving the `--no-ff` option from the command 25 line). When set to `only`, only such fast-forward merges are 26 allowed (equivalent to giving the `--ff-only` option from the 27 command line). 28 29merge.verifySignatures:: 30 If true, this is equivalent to the --verify-signatures command 31 line option. See linkgit:git-merge[1] for details. 32 33include::fmt-merge-msg.txt[] 34 35merge.renameLimit:: 36 The number of files to consider when performing rename detection 37 during a merge; if not specified, defaults to the value of 38 diff.renameLimit. This setting has no effect if rename detection 39 is turned off. 40 41merge.renames:: 42 Whether Git detects renames. If set to "false", rename detection 43 is disabled. If set to "true", basic rename detection is enabled. 44 Defaults to the value of diff.renames. 45 46merge.directoryRenames:: 47 Whether Git detects directory renames, affecting what happens at 48 merge time to new files added to a directory on one side of 49 history when that directory was renamed on the other side of 50 history. If merge.directoryRenames is set to "false", directory 51 rename detection is disabled, meaning that such new files will be 52 left behind in the old directory. If set to "true", directory 53 rename detection is enabled, meaning that such new files will be 54 moved into the new directory. If set to "conflict", a conflict 55 will be reported for such paths. If merge.renames is false, 56 merge.directoryRenames is ignored and treated as false. Defaults 57 to "conflict". 58 59merge.renormalize:: 60 Tell Git that canonical representation of files in the 61 repository has changed over time (e.g. earlier commits record 62 text files with CRLF line endings, but recent ones use LF line 63 endings). In such a repository, Git can convert the data 64 recorded in commits to a canonical form before performing a 65 merge to reduce unnecessary conflicts. For more information, 66 see section "Merging branches with differing checkin/checkout 67 attributes" in linkgit:gitattributes[5]. 68 69merge.stat:: 70 Whether to print the diffstat between ORIG_HEAD and the merge result 71 at the end of the merge. True by default. 72 73merge.tool:: 74 Controls which merge tool is used by linkgit:git-mergetool[1]. 75 The list below shows the valid built-in values. 76 Any other value is treated as a custom merge tool and requires 77 that a corresponding mergetool.<tool>.cmd variable is defined. 78 79merge.guitool:: 80 Controls which merge tool is used by linkgit:git-mergetool[1] when the 81 -g/--gui flag is specified. The list below shows the valid built-in values. 82 Any other value is treated as a custom merge tool and requires that a 83 corresponding mergetool.<guitool>.cmd variable is defined. 84 85include::../mergetools-merge.txt[] 86 87merge.verbosity:: 88 Controls the amount of output shown by the recursive merge 89 strategy. Level 0 outputs nothing except a final error 90 message if conflicts were detected. Level 1 outputs only 91 conflicts, 2 outputs conflicts and file changes. Level 5 and 92 above outputs debugging information. The default is level 2. 93 Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable. 94 95merge.<driver>.name:: 96 Defines a human-readable name for a custom low-level 97 merge driver. See linkgit:gitattributes[5] for details. 98 99merge.<driver>.driver:: 100 Defines the command that implements a custom low-level 101 merge driver. See linkgit:gitattributes[5] for details. 102 103merge.<driver>.recursive:: 104 Names a low-level merge driver to be used when 105 performing an internal merge between common ancestors. 106 See linkgit:gitattributes[5] for details.