Skip to content

Commit 90b94c2

Browse files
artagnongitster
authored andcommitted
Documentation: Add diff.<driver>.* to config
Although the gitattributes page contains comprehensive information about these configuration options, they should be included in the config documentation for completeness. It may be better to rename the "driver" in "diff.<driver>.*" to something like "content type" or "file type", but for now, let's keep it consistent across this part of the documentation and the original description in the gitattributes documentation. Helped-by: Jakub Narebski <[email protected]> Helped-by: Michael J Gruber <[email protected]> Helped-by: Junio C Hamano <[email protected]> Signed-off-by: Ramkumar Ramachandra <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 19299a8 commit 90b94c2

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

Documentation/diff-config.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,31 @@ diff.tool::
6060
`merge.tool` when used by linkgit:git-difftool[1] and has
6161
the same valid values as `merge.tool` minus "tortoisemerge"
6262
and plus "kompare".
63+
64+
diff.<driver>.command::
65+
The custom diff driver command. See linkgit:gitattributes[5]
66+
for details.
67+
68+
diff.<driver>.xfuncname::
69+
The regular expression that the diff driver should use to
70+
recognize the hunk header. A built-in pattern may also be used.
71+
See linkgit:gitattributes[5] for details.
72+
73+
diff.<driver>.binary::
74+
Set this option to true to make the diff driver treat files as
75+
binary. See linkgit:gitattributes[5] for details.
76+
77+
diff.<driver>.textconv::
78+
The command that the diff driver should call to generate the
79+
text-converted version of a file. The result of the
80+
conversion is used to generate a human-readable diff. See
81+
linkgit:gitattributes[5] for details.
82+
83+
diff.<driver>.wordregex::
84+
The regular expression that the diff driver should use to
85+
split words in a line. See linkgit:gitattributes[5] for
86+
details.
87+
88+
diff.<driver>.cachetextconv::
89+
Set this option to true to make the diff driver cache the text
90+
conversion outputs. See linkgit:gitattributes[5] for details.

0 commit comments

Comments
 (0)