On Wed, May 12, 2010 at 4:57 AM, Jakub Narebski <jnareb@xxxxxxxxx> wrote: > On Mon, 10 May 2010, Pavan Kumar Sunkara wrote: >> On Monday 10 May 2010 06:25 PM, Jakub Narebski wrote: >>> On Mon, 10 May 2010, Pavan Kumar Sunkara wrote: >>> >>>> Gitweb: Move static files into seperate subdirectory >>>> >>>> Create a new subdirectory called 'static' in gitweb/, and move >>>> all static files required by gitweb.cgi when running, which means >>>> styles, images and Javascript code. This should make gitweb more >>>> readable and easier to maintain. >>>> >>>> Update t/gitweb-lib.sh to reflect this change. The default is >>>> now to install static files also in 'static' subdirectory in target >>>> directory: update Makefile, gitweb's INSTALL, README and Makefile >>>> >>>> Signed-off-by: Pavan Kumar Sunkara<pavan.sss1991@xxxxxxxxx> > >> I would like to know when this patch will be merged. > > Note please that this patch conflict on semantic level with the > patch adding support for 'install' target in gitweb/Makefile (and > install-gitweb to the main Makefile), which means that either this > one or the 'jn/gitweb-install' would have to be changed. > > -- > Jakub Narebski > Poland > Yeah, actually me and petr have been discussing about 'install' target in gitweb/Makefile. So, I will apply these 2 patches http://repo.or.cz/w/alt-git.git/patch/152d94348f6a38eb7cb5f4af8397f51ba06ddffb http://repo.or.cz/w/alt-git.git/patch/8515392f5d4c5a36a0f9e4a73068f7106d7f4638 and resubmit this patch. Thanks - Pavan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html