diff options
| author |  David Aguilar <davvid@gmail.com> | 2013-01-27 16:52:26 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-02-02 21:46:52 -0800 |
| commit | f35ec546008e8390e0fd8e545680e72fae0efa35 (patch) | |
| tree | a9877d98b18e0cb133ff6b861e86aa9b9fb36634 /Documentation/merge-config.txt | |
| parent | mergetool--lib: list user configured tools in '--tool-help' (diff) | |
| download | tgif-f35ec546008e8390e0fd8e545680e72fae0efa35.tar.xz | |
doc: generate a list of valid merge tools
Use the show_tool_names() function to build lists of all
the built-in tools supported by difftool and mergetool.
This frees us from needing to update the documentation
whenever a new tool is added.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 861bd6f553..5f40e719bb 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -52,12 +52,12 @@ merge.stat:: 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. + 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.<tool>.cmd variable is defined. + +include::mergetools-merge.txt[] merge.verbosity:: Controls the amount of output shown by the recursive merge |