Improve readability by dropping superflous verbs like "specifies", "controls", and "defines". Describe the `merge.tool` option just before the `mergetool.*` options. Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> --- Documentation/merge-config.txt | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 33bf74c..d3dd640 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -1,5 +1,5 @@ merge.conflictstyle:: - Specify the style in which conflicted hunks are written out to + 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 @@ -28,19 +28,11 @@ merge.renormalize:: 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 resolution program is used by - linkgit:git-mergetool[1]. Valid built-in values are: "araxis", - "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", - "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" - and "xxdiff". Any other value is treated is custom merge tool - and there must be a corresponding mergetool.<tool>.cmd option. + Set this option to false to omit printing the diffstat between + ORIG_HEAD and the merge result at the end of the merge. merge.verbosity:: - Controls the amount of output shown by the recursive merge + 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 @@ -48,15 +40,22 @@ merge.verbosity:: Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable. merge.<driver>.name:: - Defines a human-readable name for a custom low-level - merge driver. See linkgit:gitattributes[5] for details. + The name of the custom merge driver. See + linkgit:gitattributes[5] for details. merge.<driver>.driver:: - Defines the command that implements a custom low-level - merge driver. See linkgit:gitattributes[5] for details. + The command that implements the custom merge driver. See + linkgit:gitattributes[5] for details. merge.<driver>.recursive:: - Names a low-level merge driver to be used when - performing an internal merge between common ancestors. - See linkgit:gitattributes[5] for details. + The merge driver to be used when performing an internal merge + between common ancestors. See linkgit:gitattributes[5] for + details. + +merge.tool:: + The merge tool to be used by linkgit:git-mergetool[1]. Valid + built-in values are: "araxis", "bc3", "diffuse", "ecmerge", + "emerge", "gvimdiff", "kdiff3", "meld", "opendiff", "p4merge", + "tkdiff", "tortoisemerge", "vimdiff" and "xxdiff". Any other + value is treated as a custom merge tool, and there must be a + corresponding mergetool.<tool>.cmd option. -- 1.7.4.rc1.7.g2cf08.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html