diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2011-04-07 00:16:49 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-06 15:22:17 -0700 |
| commit | 90b94c26f7ae5241aa1d17c7076c103d9896b534 (patch) | |
| tree | bb26719bf9ef9893e96f5133cf8215ebd2f38617 /Documentation/diff-config.txt | |
| parent | 19299a84f7f71b1ddf0b30732776dd5b351f2f24 (diff) | |
| download | git-90b94c26f7ae5241aa1d17c7076c103d9896b534.tar.gz | |
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>
Diffstat (limited to 'Documentation/diff-config.txt')
| -rw-r--r-- | Documentation/diff-config.txt | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 8cce1a99fc..bbf4753488 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -60,3 +60,31 @@ diff.tool:: `merge.tool` when used by linkgit:git-difftool[1] and has the same valid values as `merge.tool` minus "tortoisemerge" and plus "kompare". + +diff.<driver>.command:: + The custom diff driver command. See linkgit:gitattributes[5] + for details. + +diff.<driver>.xfuncname:: + The regular expression that the diff driver should use to + recognize the hunk header. A built-in pattern may also be used. + See linkgit:gitattributes[5] for details. + +diff.<driver>.binary:: + Set this option to true to make the diff driver treat files as + binary. See linkgit:gitattributes[5] for details. + +diff.<driver>.textconv:: + The command that the diff driver should call to generate the + text-converted version of a file. The result of the + conversion is used to generate a human-readable diff. See + linkgit:gitattributes[5] for details. + +diff.<driver>.wordregex:: + The regular expression that the diff driver should use to + split words in a line. See linkgit:gitattributes[5] for + details. + +diff.<driver>.cachetextconv:: + Set this option to true to make the diff driver cache the text + conversion outputs. See linkgit:gitattributes[5] for details. |