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 /merge-recursive.c | |
| parent | 19299a84f7f71b1ddf0b30732776dd5b351f2f24 (diff) | |
| download | git-90b94c26f7ae5241aa1d17c7076c103d9896b534.tar.gz git-90b94c26f7ae5241aa1d17c7076c103d9896b534.tar.xz | |
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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions