Merge git://git.kernel.org/pub/scm/git/gitweb

diff --cc gitweb/README
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3014d7320bcc5412447070c5a5eacf0d25317eb8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/gitweb/README
@@@ -1,0 -1,0 +1,16 @@@
++GIT web Interface
++
++The one working on:
++  http://www.kernel.org/git/
++
++Get the gitweb.cgi by ftp:
++  ftp://ftp.kernel.org/pub/software/scm/gitweb/
++
++It reqires the git-core binaries installed on the system:
++  http://www.kernel.org/git/?p=git/git.git;a=summary
++
++The gitweb repository is here:
++  http://www.kernel.org/git/?p=git/gitweb.git;a=summary
++
++Any comment/question/concern to:
++  Kay Sievers <kay.sievers@vrfy.org>

diff --cc gitweb/gitweb.cgi
index 0000000000000000000000000000000000000000,ea21fbe88a9455c80fd88f4f510fd928638b68e5..ea21fbe88a9455c80fd88f4f510fd928638b68e5
mode 000000,100755..100755
--- /dev/null
--- 2/gitweb.cgi
+++ b/gitweb/gitweb.cgi

diff --cc gitweb/test/Märchen
index 0000000000000000000000000000000000000000,8f7a1d3e9c7804bf543f186c46ebd51ff9335827..8f7a1d3e9c7804bf543f186c46ebd51ff9335827
mode 000000,100644..100644
--- /dev/null
--- 2/test/Märchen
+++ b/gitweb/test/Märchen

diff --cc gitweb/test/file with spaces
index 0000000000000000000000000000000000000000,f108543c4e560c50f473db167fd6a8c946e3dfed..f108543c4e560c50f473db167fd6a8c946e3dfed
mode 000000,100644..100644
--- /dev/null
--- 2/test/file with spaces
+++ b/gitweb/test/file with spaces

diff --cc gitweb/test/file+plus+sign
index 0000000000000000000000000000000000000000,fd05278808d458602587bb024a48726018d30926..fd05278808d458602587bb024a48726018d30926
mode 000000,100644..100644
--- /dev/null
--- 2/test/file+plus+sign
+++ b/gitweb/test/file+plus+sign