Merge branch 'dm/disable-clone'

diff --cc cgit.c
index e302a7c8c387cf096a4f387792c41223cc048b01,e0c2d9fb45e252d107853d03317c99c4b08d83ae..349d6e035cd05130579ba4feb763b805f095116d
--- 1/cgit.c
--- 2/cgit.c
+++ b/cgit.c
@@@ -147,10 -139,10 +147,12 @@@ void config_cb(const char *name, const 
                ctx.cfg.enable_filter_overrides = atoi(value);
        else if (!strcmp(name, "enable-gitweb-owner"))
                ctx.cfg.enable_gitweb_owner = atoi(value);
+       else if (!strcmp(name, "enable-http-clone"))
+               ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))
                ctx.cfg.enable_index_links = atoi(value);
 +      else if (!strcmp(name, "enable-commit-graph"))
 +              ctx.cfg.enable_commit_graph = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))
                ctx.cfg.enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))

diff --cc cgit.h
index b5f00fc9c1c1d6d6e7f7a8cdc2695cab334752ab,c119712c0a9f4e5fc9b336208fc2f01c575ec5ad..ecae4537a6b3cfc72d78e33026c9a053b65b69f4
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -191,8 -187,8 +191,9 @@@ struct cgit_config 
        int embedded;
        int enable_filter_overrides;
        int enable_gitweb_owner;
+       int enable_http_clone;
        int enable_index_links;
 +      int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;

diff --cc cgitrc.5.txt
Simple merge

diff --cc cmd.c
Simple merge