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 <jnareb@gmail.com> Helped-by: Michael J Gruber <git@drmicha.warpmail.net> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Apr 7, 2011 at 00:16 UTC
90b94c26f7ae5241aa1d17c7076c103d9896b534
1 file changed
+28
Documentation/diff-config.txt
+28
@@ -60,3 +60,31 @@ diff.tool::
60
`merge.tool` when used by linkgit:git-difftool[1] and has
61
the same valid values as `merge.tool` minus "tortoisemerge"
62
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.