summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ramkumar Ramachandra <artagnon@gmail.com>2011-04-07 00:16:48 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-06 15:17:06 -0700
commit26488f5922061f924b9ffe6cc83404113124d9e0 (patch)
tree34a2048b56adce32c245424dc4d42d6299788841
parentGit 1.7.4.4 (diff)
downloadtgif-26488f5922061f924b9ffe6cc83404113124d9e0.tar.xz
Documentation: Add filter.<driver>.* to config
Although the gitattributes page contains comprehensive information about these configuration options, they should be included in the config documentation for completeness. Helped-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6babbc7837..0d98c92cc9 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -973,6 +973,16 @@ format.signoff::
the rights to submit this work under the same open source license.
Please see the 'SubmittingPatches' document for further discussion.
+filter.<driver>.clean::
+ The command which is used to convert the content of a worktree
+ file to a blob upon checkin. See linkgit:gitattributes[5] for
+ details.
+
+filter.<driver>.smudge::
+ The command which is used to convert the content of a blob
+ object to a 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