diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-21 08:44:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-21 08:44:54 -0800 |
| commit | 780f7fdaa36b70d08fb26191904c3103207cc40d (patch) | |
| tree | 09e3d98dc6e513854fd7f2dbec228770b48b8c76 | |
| parent | Merge branch 'ps/the-repository' (diff) | |
| parent | difftool docs: restore correct position of tool list (diff) | |
| download | git-780f7fdaa36b70d08fb26191904c3103207cc40d.tar.gz git-780f7fdaa36b70d08fb26191904c3103207cc40d.zip | |
Merge branch 'aj/difftool-config-doc-fix'
Docfix.
* aj/difftool-config-doc-fix:
difftool docs: restore correct position of tool list
| -rw-r--r-- | Documentation/config/diff.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/difftool.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index fdae13a212..1135a62a0a 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -218,8 +218,6 @@ endif::git-diff[] Set this option to `true` to make the diff driver cache the text conversion outputs. See linkgit:gitattributes[5] for details. -include::{build_dir}/mergetools-diff.txt[] - `diff.indentHeuristic`:: Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read. diff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.txt index 447c40d85a..6cd47331a9 100644 --- a/Documentation/config/difftool.txt +++ b/Documentation/config/difftool.txt @@ -13,6 +13,8 @@ diff.guitool:: and requires that a corresponding difftool.<guitool>.cmd variable is defined. +include::{build_dir}/mergetools-diff.txt[] + difftool.<tool>.cmd:: Specify the command to invoke the specified diff tool. The specified command is evaluated in shell with the following |