git/gitweb, branch v1.7.8.2

Merge branch 'rj/gitweb-clean-js'

2011-10-27T19:04:21Z

* rj/gitweb-clean-js: gitweb/Makefile: Remove static/gitweb.js in the clean target

Merge branch 'lh/gitweb-site-html-head'

2011-10-26T23:16:31Z

* lh/gitweb-site-html-head: gitweb: provide a way to customize html headers

Merge branch 'jm/maint-gitweb-filter-forks-fix'

2011-10-26T23:16:30Z

* jm/maint-gitweb-filter-forks-fix: gitweb: fix regression when filtering out forks

gitweb/Makefile: Remove static/gitweb.js in the clean target

2011-10-26T21:03:58Z

Since 9a86dd5 (gitweb: Split JavaScript for maintability, combining on build, 2011-04-28), static/gitweb.js has been a build product that should be cleaned upon "make clean". Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano

gitweb: fix regression when filtering out forks

2011-10-21T21:46:38Z

This fixes a condition in filter_forks_from_projects_list that failed if process directory was different from project root: in such case, the subroutine was a no-op and forks were not detected. Signed-off-by: Julien Muchembled Tested-by: Jakub Narebski Signed-off-by: Junio C Hamano

gitweb: provide a way to customize html headers

2011-10-21T17:18:37Z

This allows web sites to add some specific html headers to the pages generated by gitweb. The new variable $site_html_head_string can be set to an html snippet that will be inserted at the end of the section of each page generated by gitweb. Signed-off-by: LÃ©naÃ¯c Huard Signed-off-by: Junio C Hamano

Merge branch 'jn/gitweb-manpages'

2011-10-19T04:59:11Z

* jn/gitweb-manpages: gitweb: Add gitweb manpages to 'gitweb' package in git.spec Documentation: Add gitweb config variables to git-config(1) Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages gitweb: Add gitweb(1) manpage for gitweb itself gitweb: Add gitweb.conf(5) manpage for gitweb configuration files

gitweb: Add gitweb(1) manpage for gitweb itself

2011-10-16T18:09:34Z

Most of what is in gitweb.txt it has been pulled directly from the README and INSTALL files of gitweb. Current version is somewhat based on structure of SVN::Web manpage (one of web interfaces for Subversion). gitweb.conf(5) i.e. gitweb configuration manpage now refers to appropriate sections in gitweb(1). gitweb/README now refers to gitweb/INSTALL and gitweb(1) manpage. gitweb/INSTALL now refers to gitweb.conf(5) and gitweb(1). Inspired-by: Drew Northup Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

gitweb: Add gitweb.conf(5) manpage for gitweb configuration files

2011-10-16T18:09:34Z

Much of what is in gitweb.conf.txt has been pulled directly from the README file of gitweb. The manpage was supplemented with description of missing gitweb config variables, and with description of gitweb's %features. There remains a bit of redundancy, which should be reduced if possible... but I think some of duplication of information is inevitable. [jn: Improved, extended, removed duplicate info from README] Signed-off-by: Drew Northup Signed-off-by: Jakub Narebski Helped-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'ps/gitweb-js-with-lineno'

2011-10-10T22:56:20Z

* ps/gitweb-js-with-lineno: gitweb: Fix links to lines in blobs when javascript-actions are enabled