Merge branch 'lh/plugins'

Conflicts:
	cgit.c
	cgit.h

1 files changed, 20 insertions, 0 deletions

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 0412f64..dc63637 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -57,2 +57,8 @@ clone-prefix::
 
+commit-filter::
+        Specifies a command which will be invoked to format commit messages.
+        The command will get the message on its STDIN, and the STDOUT from the
+        command will be included verbatim as the commit message, i.e. this can
+        be used to implement bugtracker integration. Default value: none.
+
 css::
@@ -208,2 +214,10 @@ snapshots::
 
+source-filter::
+        Specifies a command which will be invoked to format plaintext blobs
+        in the tree view. The command will get the blob content on its STDIN
+        and the name of the blob as its only command line argument. The STDOUT
+        from the command will be included verbatim as the blob contents, i.e.
+        this can be used to implement e.g. syntax highlighting. Default value:
+        none.
+
 summary-branches::
@@ -234,2 +248,5 @@ repo.clone-url::
 
+repo.commit-filter::
+        Override the default commit-filter. Default value: <commit-filter>.
+
 repo.defbranch::
@@ -274,2 +291,5 @@ repo.snapshots::
 
+repo.source-filter::
+        Override the default source-filter. Default value: <source-filter>.
+
 repo.url::