diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-26 11:11:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-26 11:11:18 -0800 |
| commit | 42fc11c1103a88c49233f04dc0c2f5659b3973fe (patch) | |
| tree | e376a924ff3128ec31582fd988f166cdbfdb9413 /Documentation/merge-config.txt | |
| parent | f20706220ba788a40b6634255215ccb87accca70 (diff) | |
| parent | b0f34c3d6719903e280545e73ae89f6c2ebe533f (diff) | |
| download | git-42fc11c1103a88c49233f04dc0c2f5659b3973fe.tar.gz | |
Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc
* mm/maint-sort-config-doc:
config.txt: alphabetize configuration sections
Conflicts:
Documentation/config.txt
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index c735788b0f..86d5b26ab2 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -1,6 +1,10 @@ -merge.stat:: - Whether to print the diffstat between ORIG_HEAD and the merge result - at the end of the merge. True by default. +merge.conflictstyle:: + Specify the style in which conflicted hunks are written out to + working tree files upon merge. The default is "merge", which + shows `<<<<<<<` conflict marker, change made by one side, + `=======` marker, change made by the other side, and then + `>>>>>>>` marker. An alternate style, "diff3", adds `|||||||` + marker and the original text before `=======` marker. merge.log:: Whether to include summaries of merged commits in newly created @@ -11,6 +15,10 @@ merge.renameLimit:: during a merge; if not specified, defaults to the value of diff.renameLimit. +merge.stat:: + Whether to print the diffstat between ORIG_HEAD and the merge result + at the end of the merge. True by default. + merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", |