Merge branch 'jh/ignorews'

diff --cc cgit.c
index fde0757416798d90808809e5b434384d5261f6ed,945288445472aca4850b95318db957a320ce15a1..c2638727b629438d89cb0f3d7efa851ae1779a36
--- 1/cgit.c
--- 2/cgit.c
+++ b/cgit.c
@@@ -256,10 -250,10 +256,12 @@@ 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);
+       } else if (!strcmp(name, "ignorews")) {
+               ctx.qry.ignorews = atoi(value);
        }
  }
  

diff --cc cgit.h
index 2bf6ab023fb44340b16e564c6cfee7a2b4442fa6,1bdfbc666aeed1d4bd995e2524979a03669de471..e9e27188056157507452e13abe20e4fc056c2a6c
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -146,8 -145,8 +146,9 @@@ struct cgit_query 
        char *sort;
        int showmsg;
        int ssdiff;
 +      int show_all;
        int context;
+       int ignorews;
        char *vpath;
  };
  

diff --cc shared.c
Simple merge

diff --cc ui-log.c
Simple merge

diff --cc ui-shared.c
Simple merge