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/diff-config.txt | |
| parent | 665682c9fd81df7e2dc8fe9db28fa5918a2f8ba0 (diff) | |
| download | git-f35ec546008e8390e0fd8e545680e72fae0efa35.tar.gz | |
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/diff-config.txt')
| -rw-r--r-- | Documentation/diff-config.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 67a90a828c..7c968d1bab 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -132,9 +132,10 @@ diff.<driver>.cachetextconv:: conversion outputs. See linkgit:gitattributes[5] for details. diff.tool:: - The diff tool to be used by linkgit:git-difftool[1]. This - option overrides `merge.tool`, and has the same valid built-in - values as `merge.tool` minus "tortoisemerge" and plus - "kompare". Any other value is treated as a custom diff tool, - and there must be a corresponding `difftool.<tool>.cmd` - option. + Controls which diff tool is used by linkgit:git-difftool[1]. + This variable overrides the value configured in `merge.tool`. + The list below shows the valid built-in values. + Any other value is treated as a custom diff tool and requires + that a corresponding difftool.<tool>.cmd variable is defined. + +include::mergetools-diff.txt[] |