projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 42fc11c1 JH |
1 | merge.conflictstyle:: |
| 2 | Specify the style in which conflicted hunks are written out to | |
| 3 | working tree files upon merge. The default is "merge", which | |
| 29b802aa RW |
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. | |
| 3e6c0a3f | 8 | |
| 6cd9cfef | 9 | merge.log:: |
| bda3b8ff RR |
10 | In addition to branch names, populate the log message with at |
| 11 | most the specified number of one-line descriptions from the | |
| 12 | actual commits that are being merged. Defaults to false, and | |
| 13 | true is a synoym for 20. | |
| f5a84c37 | 14 | |
| 2a2ac926 JK |
15 | merge.renameLimit:: |
| 16 | The number of files to consider when performing rename detection | |
| 17 | during a merge; if not specified, defaults to the value of | |
| 18 | diff.renameLimit. | |
| 19 | ||
| f217f0e8 EB |
20 | merge.renormalize:: |
| 21 | Tell git that canonical representation of files in the | |
| 22 | repository has changed over time (e.g. earlier commits record | |
| 23 | text files with CRLF line endings, but recent ones use LF line | |
| 24 | endings). In such a repository, git can convert the data | |
| 25 | recorded in commits to a canonical form before performing a | |
| 26 | merge to reduce unnecessary conflicts. For more information, | |
| 27 | see section "Merging branches with differing checkin/checkout | |
| 28 | attributes" in linkgit:gitattributes[5]. | |
| 29 | ||
| 42fc11c1 JH |
30 | merge.stat:: |
| 31 | Whether to print the diffstat between ORIG_HEAD and the merge result | |
| 32 | at the end of the merge. True by default. | |
| 33 | ||
| f5a84c37 SG |
34 | merge.tool:: |
| 35 | Controls which merge resolution program is used by | |
| 36 | linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", | |
| da81688c | 37 | "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", |
| c8998b48 | 38 | "diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and |
| f5a84c37 | 39 | "opendiff". Any other value is treated is custom merge tool |
| 1168d402 | 40 | and there must be a corresponding mergetool.<tool>.cmd option. |
| f5a84c37 SG |
41 | |
| 42 | merge.verbosity:: | |
| 43 | Controls the amount of output shown by the recursive merge | |
| 44 | strategy. Level 0 outputs nothing except a final error | |
| 45 | message if conflicts were detected. Level 1 outputs only | |
| 46 | conflicts, 2 outputs conflicts and file changes. Level 5 and | |
| 47 | above outputs debugging information. The default is level 2. | |
| 29b802aa | 48 | Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable. |
| f5a84c37 SG |
49 | |
| 50 | merge.<driver>.name:: | |
| 29b802aa | 51 | Defines a human-readable name for a custom low-level |
| f5a84c37 SG |
52 | merge driver. See linkgit:gitattributes[5] for details. |
| 53 | ||
| 54 | merge.<driver>.driver:: | |
| 55 | Defines the command that implements a custom low-level | |
| 56 | merge driver. See linkgit:gitattributes[5] for details. | |
| 57 | ||
| 58 | merge.<driver>.recursive:: | |
| 59 | Names a low-level merge driver to be used when | |
| 60 | performing an internal merge between common ancestors. | |
| 61 | See linkgit:gitattributes[5] for details. |