mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'aj/difftool-config-doc-fix'

Browse Source 
Docfix.

* aj/difftool-config-doc-fix:
  difftool docs: restore correct position of tool list
This commit is contained in:
Junio C Hamano
2025-01-21 08:44:54 -08:00
parent 7b39a128c8 21e1b44865
commit 780f7fdaa3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config/diff.txt
View File

@ -218,8 +218,6 @@ endif::git-diff[]
Set this option to `true` to make the diff driver cache the text Set this option to `true` to make the diff driver cache the text
conversion outputs. See linkgit:gitattributes[5] for details. conversion outputs. See linkgit:gitattributes[5] for details.
include::{build_dir}/mergetools-diff.txt[]
`diff.indentHeuristic`:: `diff.indentHeuristic`::
Set this option to `false` to disable the default heuristics Set this option to `false` to disable the default heuristics
that shift diff hunk boundaries to make patches easier to read. that shift diff hunk boundaries to make patches easier to read.

2
Documentation/config/difftool.txt
View File

@ -13,6 +13,8 @@ diff.guitool::
and requires that a corresponding difftool.<guitool>.cmd variable and requires that a corresponding difftool.<guitool>.cmd variable
is defined. is defined.
include::{build_dir}/mergetools-diff.txt[]
difftool.<tool>.cmd:: difftool.<tool>.cmd::
Specify the command to invoke the specified diff tool. Specify the command to invoke the specified diff tool.
The specified command is evaluated in shell with the following The specified command is evaluated in shell with the following