Merge branch 'full-log'

Conflicts:
	cgit.c
	cgit.h

1 file changed, 1 insertion, 0 deletions

diff --git a/cgit.h b/cgit.hindex f1fbeca0..cb2f176f 100644--- a/cgit.h+++ b/cgit.h@@ -123,6 +123,7 @@ struct cgit_query { 	int   ofs; 	int nohead; 	char *sort;+	int showmsg; };  struct cgit_config {
diff --git a/cgit.h b/cgit.h
index f1fbeca0..cb2f176f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -123,6 +123,7 @@ struct cgit_query {
 	int   ofs;
 	int nohead;
 	char *sort;
+	int showmsg;
 };
 
 struct cgit_config {