diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:16 -0800 |
| commit | 39ca1bd88256ea482305b7e0acc943ef14e4b36d (patch) | |
| tree | 263d715e9f62be9995ecba9979c26ae10523ef41 /Documentation/diff-config.txt | |
| parent | eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e (diff) | |
| parent | f35ec546008e8390e0fd8e545680e72fae0efa35 (diff) | |
| download | git-39ca1bd88256ea482305b7e0acc943ef14e4b36d.tar.gz | |
Merge branch 'da/mergetool-docs'
Build on top of the clean-up done by jk/mergetool and automatically
generate the list of mergetool and difftool backends the build
supports to be included in the documentation.
* da/mergetool-docs:
doc: generate a list of valid merge tools
mergetool--lib: list user configured tools in '--tool-help'
mergetool--lib: add functions for finding available tools
mergetool--lib: improve the help text in guess_merge_tool()
mergetool--lib: simplify command expressions
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 6d06aa4357..7c70c2a2fe 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -149,9 +149,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[] |