From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 22 Jun 2010 14:16:12 +0000 (+0200)
Subject: Merge branch 'jh/context-lines'
X-Git-Tag: v0.9~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f92f332e6a9ee3e16051bda9fe148607af67f65;p=cgit

Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h
---

6f92f332e6a9ee3e16051bda9fe148607af67f65
diff --cc cgit.c
index d4fcfa7,e9bafb5..ab25b6a
--- a/cgit.c
+++ b/cgit.c
@@@ -256,8 -250,8 +256,10 @@@ static void querystring_cb(const char *
  		ctx.qry.period = xstrdup(value);
  	} else if (!strcmp(name, "ss")) {
  		ctx.qry.ssdiff = atoi(value);
 +	} else if (!strcmp(name, "all")) {
 +		ctx.qry.show_all = atoi(value);
+ 	} else if (!strcmp(name, "context")) {
+ 		ctx.qry.context = atoi(value);
  	}
  }
  
diff --cc cgit.h
index 80c3902,bb8f598..2b28d63
--- a/cgit.h
+++ b/cgit.h
@@@ -146,7 -145,7 +146,8 @@@ struct cgit_query 
  	char *sort;
  	int showmsg;
  	int ssdiff;
 +	int show_all;
+ 	int context;
  	char *vpath;
  };