From: Ramkumar Ramachandra Date: Fri, 01 Apr 2011 08:47:38 GMT Subject: [PATCH] Documentation: Document diff..* and filter..* in config Message-ID: <1301647658-28047-1-git-send-email-artagnon@gmail.com> Although the gitattributes page contains comprehensive information about these configuration options, they should be included in the config documentation for completeness. Signed-off-by: Ramkumar Ramachandra --- Documentation/config.txt | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 8ea55d4..db1801e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -875,6 +875,24 @@ diff.tool:: the same valid values as `merge.tool` minus "tortoisemerge" and plus "kompare". +diff..command:: + Defines a human-readable name for a custom low-level diff + tool. See linkgit:gitattributes[5] for details. + +diff..xfuncname:: + Defines the command that implements a custom low-level merge + tool. See linkgit:gitattributes[5] for details. + +diff..textconv:: + Names a low-level merge tool to be used when performing an + internal merge between common ancestors. See + linkgit:gitattributes[5] for details. + +diff..cachetextconv:: + Names a low-level merge tool to be used when performing an + internal merge between common ancestors. See + linkgit:gitattributes[5] for details. + difftool..path:: Override the path for the given tool. This is useful in case your tool is not in the PATH. @@ -973,6 +991,16 @@ format.signoff:: the rights to submit this work under the same open source license. Please see the 'SubmittingPatches' document for further discussion. +filter..clean:: + Defines the command to be used to convert the contents of + worktree file upon checkin. See linkgit:gitattributes[5] for + details. + +filter..smudge:: + Defines the command to be used to convert the blob object to + worktree file upon checkout. See linkgit:gitattributes[5] for + details. + gc.aggressiveWindow:: The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults -- 1.7.4.rc1.7.g2cf08.dirty