From: Nguyễn Thái Ngọc Duy Date: Sat, 27 Oct 2018 06:23:19 +0000 (+0200) Subject: config.txt: move merge-config.txt to config/ X-Git-Tag: v2.20.0-rc0~59^2~32 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7fb5ab4a020185c74007ca04ca6f8de9a3ae3868?hp=f7ade6c98045d27039a76691657d2fbf08e527fc config.txt: move merge-config.txt to config/ Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index c3c92bc269..441787e815 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -371,7 +371,7 @@ include::config/mailmap.txt[] include::config/man.txt[] -include::merge-config.txt[] +include::config/merge.txt[] mergetool..path:: Override the path for the given tool. This is useful in case diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt new file mode 100644 index 0000000000..321d1c8ba9 --- /dev/null +++ b/Documentation/config/merge.txt @@ -0,0 +1,87 @@ +merge.conflictStyle:: + 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 `=======` marker. + +merge.defaultToUpstream:: + 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..merge` that name the + branches at the remote named by `branch..remote` + are consulted, and then they are mapped via `remote..fetch` + to their corresponding remote-tracking branches, and the tips of + these tracking branches are merged. + +merge.ff:: + 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-ff` option from the command + line). When set to `only`, only such fast-forward merges are + allowed (equivalent to giving the `--ff-only` option from the + command line). + +merge.verifySignatures:: + If true, this is equivalent to the --verify-signatures command + line option. See linkgit:git-merge[1] for details. + +include::fmt-merge-msg.txt[] + +merge.renameLimit:: + The number of files to consider when performing rename detection + during a merge; if not specified, defaults to the value of + diff.renameLimit. This setting has no effect if rename detection + is turned off. + +merge.renames:: + Whether and how Git detects renames. If set to "false", + rename detection is disabled. If set to "true", basic rename + detection is enabled. Defaults to the value of diff.renames. + +merge.renormalize:: + 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 linkgit:gitattributes[5]. + +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 tool is used by linkgit:git-mergetool[1]. + 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..cmd variable is defined. + +include::../mergetools-merge.txt[] + +merge.verbosity:: + 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. + +merge..name:: + Defines a human-readable name for a custom low-level + merge driver. See linkgit:gitattributes[5] for details. + +merge..driver:: + Defines the command that implements a custom low-level + merge driver. See linkgit:gitattributes[5] for details. + +merge..recursive:: + Names a low-level merge driver to be used when + performing an internal merge between common ancestors. + See linkgit:gitattributes[5] for details. diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index eb36837f86..4cc86469f3 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -342,7 +342,7 @@ include::merge-strategies.txt[] CONFIGURATION ------------- -include::merge-config.txt[] +include::config/merge.txt[] branch..mergeOptions:: Sets default options for merging into branch . The syntax and diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt deleted file mode 100644 index 0bb703fbac..0000000000 --- a/Documentation/merge-config.txt +++ /dev/null @@ -1,87 +0,0 @@ -merge.conflictStyle:: - 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 `=======` marker. - -merge.defaultToUpstream:: - 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..merge` that name the - branches at the remote named by `branch..remote` - are consulted, and then they are mapped via `remote..fetch` - to their corresponding remote-tracking branches, and the tips of - these tracking branches are merged. - -merge.ff:: - 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-ff` option from the command - line). When set to `only`, only such fast-forward merges are - allowed (equivalent to giving the `--ff-only` option from the - command line). - -merge.verifySignatures:: - If true, this is equivalent to the --verify-signatures command - line option. See linkgit:git-merge[1] for details. - -include::config/fmt-merge-msg.txt[] - -merge.renameLimit:: - The number of files to consider when performing rename detection - during a merge; if not specified, defaults to the value of - diff.renameLimit. This setting has no effect if rename detection - is turned off. - -merge.renames:: - Whether and how Git detects renames. If set to "false", - rename detection is disabled. If set to "true", basic rename - detection is enabled. Defaults to the value of diff.renames. - -merge.renormalize:: - 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 linkgit:gitattributes[5]. - -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 tool is used by linkgit:git-mergetool[1]. - 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..cmd variable is defined. - -include::mergetools-merge.txt[] - -merge.verbosity:: - 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. - -merge..name:: - Defines a human-readable name for a custom low-level - merge driver. See linkgit:gitattributes[5] for details. - -merge..driver:: - Defines the command that implements a custom low-level - merge driver. See linkgit:gitattributes[5] for details. - -merge..recursive:: - Names a low-level merge driver to be used when - performing an internal merge between common ancestors. - See linkgit:gitattributes[5] for details.