aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.h
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2011-02-19 22:01:59 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2011-02-19 22:01:59 (JST)
commit31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63 (patch)
tree26200ad3c376ea1208d2a870ebb3b2bc6d7abee6 /cgit.h
parente66a16cebcdac53b63e77876acef1ca9e4877038 (diff)
parentc2bfd40f8aaaa69a66c6eb729c202e42a43ec166 (diff)
downloadcgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.zip
cgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.tar.gz
Merge branch 'jh/graph'
* jh/graph: ui-log: Move 'Age' column when commit graph is present ui-log: Line-wrap long commit subjects when showmsg is enabled ui-log: Colorize commit graph ui-log: Implement support for commit graphs ui-log: Change display of full commit messages (and notes) Conflicts: cgit.css
Diffstat (limited to 'cgit.h')
-rw-r--r--cgit.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index f5f68ac..bed770b 100644
--- a/cgit.h
+++ b/cgit.h
@@ -20,6 +20,7 @@
20#include <xdiff/xdiff.h> 20#include <xdiff/xdiff.h>
21#include <utf8.h> 21#include <utf8.h>
22#include <notes.h> 22#include <notes.h>
23#include <graph.h>
23 24
24 25
25/* 26/*
@@ -71,6 +72,7 @@ struct cgit_repo {
71 char *section; 72 char *section;
72 char *clone_url; 73 char *clone_url;
73 int snapshots; 74 int snapshots;
75 int enable_commit_graph;
74 int enable_log_filecount; 76 int enable_log_filecount;
75 int enable_log_linecount; 77 int enable_log_linecount;
76 int enable_remote_branches; 78 int enable_remote_branches;
@@ -188,6 +190,7 @@ struct cgit_config {
188 int enable_filter_overrides; 190 int enable_filter_overrides;
189 int enable_gitweb_owner; 191 int enable_gitweb_owner;
190 int enable_index_links; 192 int enable_index_links;
193 int enable_commit_graph;
191 int enable_log_filecount; 194 int enable_log_filecount;
192 int enable_log_linecount; 195 int enable_log_linecount;
193 int enable_remote_branches; 196 int enable_remote_branches;